[automerger skipped] Merge Android R am: c5717db388 -s ours am: d1284fad98 -s ours am: 8a5f00c007 -s ours

am skip reason: Change-Id I7b3ac42a06bef5906226d36604c4b4245dbe2007 with SHA-1 85c9b2a67c is in history

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

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