[automerger skipped] Merge Android 12 am: fde57cf6c6 -s ours am: 742cfed6cb -s ours am: b2e013a12a -s ours am: 9dc8a3cf29 -s ours

am skip reason: Merged-In Ieb80ad22c6b1a6e973965eef2062d188742c0c83 with SHA-1 7d8c6f0085 is already in history

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

Change-Id: Ic5931fb9c4baf1e46669419755d6424cf1196233
tree: efa4f77a4f65e81434b55fad13a1590e6c9c38d9
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS
  7. PREUPLOAD.cfg