[automerger skipped] Merge Android 12L am: 39ac7fba88 -s ours am: 38e87c4cdb -s ours am: 8c88015b2b -s ours

am skip reason: Merged-In I96e0543efbc16731b1a14f77c7c314bb518e71e7 with SHA-1 977b6bf04c is already in history

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

Change-Id: I0721f70abc55dd255c1d66596be701b72a808316