[automerger skipped] Merge Android 12L am: 0901338387 -s ours

am skip reason: Merged-In I96e0543efbc16731b1a14f77c7c314bb518e71e7 with SHA-1 03a59d9b31 is already in history

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

Change-Id: I5e739ea369752bdf040cd65d9ca9d954558f7d52