[automerger skipped] Merge Android 12 am: a609c556c4 -s ours am: c6f08cf6f3 -s ours am: d70ab942e6 -s ours

am skip reason: Merged-In Ife18fca3918a305ea69865f385e690a871facb1e with SHA-1 495bf24ef8 is already in history

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

Change-Id: I9965b783e11d0861da692936f1ce3283ca07a439