[automerger skipped] Merge Android 12 am: ef07513c29 -s ours am: 9a23949f8b -s ours

am skip reason: Merged-In I607aeb0147fd05a0d23f22214f1fa3b1eeacf0d5 with SHA-1 d1de55e736 is already in history

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

Change-Id: Ifd77918729004e1a8e9941aab62b8481c4f6486c