[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 141b83d1a0 -s ours

am skip reason: Merged-In I763f2164b320f45e5cafd84e971718079fb2b384 with SHA-1 33b71ac39b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Media/+/16845267

Change-Id: I94e95b640a81450d6ac3e8385768c11fdafe6e60