[automerger skipped] Merge Android 12L am: ba1e50793f -s ours am: 432b1d6ccb -s ours

am skip reason: Merged-In I047833628888634e24ac2738a459ad00aea75754 with SHA-1 141b83d1a0 is already in history

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

Change-Id: I82840ca0ac39ac303f58845738d9ec99cd589404