[automerger skipped] Merge 24Q3 to AOSP main am: 1be4a4bed1 -s ours am: b8a82b2641 -s ours

am skip reason: Merged-In I70a7d579cbb86c193c3b84f034cca0afff588c98 with SHA-1 182c69285d is already in history

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

Change-Id: I3fdd7505bffa6a7591a642138507b49b2e3d143e
Signed-off-by: Automerger Merge Worker <[email protected]>