[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 4f64b54566 -s ours

am skip reason: Merged-In I65b3cfd5b9c19b744fe71d8bd6e40d33bc9045d5 with SHA-1 aab2bdbb82 is already in history

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

Change-Id: I68e051fe916527395bddd6f5d45aab76cc9410c7