[automerger skipped] Merge Android 12 am: ef07513c29 -s ours am: 9a23949f8b -s ours am: 0b56050e80 -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: I5bf5d989e4203747fdb5e425ea228998315878b7
tree: d0a393ae3b39216349894ef823a8080b1dbb0a8d
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg