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

am skip reason: Change-Id I71e5b83468a55d22b3ccb7e053cf898f845a6ffd with SHA-1 199bbb4f1b is in history

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

Change-Id: I395fff8109ae4a84a73d5415517222f6a9c039b4
tree: 097e164c18ad7a5e4902af0fdca520f764d8e897
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS