[automerger skipped] Merge Android 12 am: fde57cf6c6 -s ours am: 742cfed6cb -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: I29602569af5feee0d592087a3578c724d8983490
tree: abe9c36eb63a4fcc07540fa5fff0550437b3c0e6
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg