[automerger skipped] Skip ab/6749736 in stage. am: 7152b2a099 -s ours am: 1ff5fa8849 -s ours

am skip reason: Change-Id I1a7ca0b30bbb2d1b27439fba2f3eab6273482da8 with SHA-1 7d1ee998db is in history

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

Change-Id: I98ca77a5587f00cfaccac5d72de17ab33d09dfdc