[automerger skipped] Merge Android 12L am: 977ef6ef43 -s ours am: 1e2b557992 -s ours

am skip reason: Merged-In I26d8050270490afca7a5789cfcf75ecbd69a12e3 with SHA-1 4f64b54566 is already in history

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

Change-Id: I7820b9239f67408120041e92dd8513bf63654914