[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: d1de55e736 -s ours am: 8dd1cc082b -s ours

am skip reason: Merged-In I4270f3798c51e21f735bdd1ca110c562fbe50516 with SHA-1 e8aab237b0 is already in history

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

Change-Id: I7844801d03841ab2fa7deb81d7b1e6827beeb654
tree: d0a393ae3b39216349894ef823a8080b1dbb0a8d
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg