[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 2847831026 -s ours am: 276f738ef5 -s ours

am skip reason: Merged-In Ie2f11416771f69dbe662ed119ce360b7c773cbd0 with SHA-1 b760ea4803 is already in history

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

Change-Id: Ife1887b3448517b5a95229e161da7dd014401fb8