[automerger skipped] Merge 10952656 am: 9efbdb4c34 -s ours

am skip reason: Merged-In I376af31d692085440b416386bbc1d7f586e91ec6 with SHA-1 a80b7b528e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/25089495

Change-Id: I62c811494977a8d34d049ce2d8999fa9874deb6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>