[automerger skipped] Merge Android 12 am: fde57cf6c6 -s ours am: 742cfed6cb -s ours am: b2e013a12a -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: Ic615e6518644e95847753c1f1072a453d92aed6a