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

am skip reason: Merged-In I4cd378b700f71b9ffa011caeeeba9ec4068c619d with SHA-1 593914a6d1 is already in history

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

Change-Id: I038513d1dba0cc6af53f76348a01cd71aa1df4f2