[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 88f0f7ade3 -s ours

am skip reason: Merged-In I82840ca0ac39ac303f58845738d9ec99cd589404 with SHA-1 fdda79589b is already in history

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

Change-Id: I4765af55e6f805f3ef59b8cd6d5f5146dca901b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>