[automerger skipped] Merge Android R am: 81bd579114 -s ours am: 9362aaa561 -s ours

am skip reason: Change-Id I0d44970326f4c8391459d98140f817235816759c with SHA-1 e04541b3f2 is in history

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

Change-Id: I0ad6c290c24aa7c02a721bea2dfe49788b21e91d