tree abe9c36eb63a4fcc07540fa5fff0550437b3c0e6
parent 6cbcdc2b5bcbc3da47095e1e6a35be7c0e08d1d0
parent b2e013a12ad7993a7f319923b78e1d551eb0821b
author Xin Li <delphij@google.com> 1633679825 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679825 +0000

[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