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

am skip reason: Merged-In I96fe6556a3c305b80013b9523089c26ecbf9ffd8 with SHA-1 1fb3366462 is already in history

Original change: https://android-review.googlesource.com/c/device/generic/car/+/1847413

Change-Id: Ie1768b978aa562d9e40027d6c3dc173566297366