[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 857708f904 -s ours am: 47cf0b6669 -s ours

am skip reason: Merged-In If4ef3ecfd8a8046e90fb62b08659fea720e3699d with SHA-1 bc674378d8 is already in history

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

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