[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6c9e0e935a -s ours

am skip reason: Change-Id Ia4c054c866db2f8559fad259151fb1fe6ee592c5 with SHA-1 a7cc839154 is in history

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

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