DO NOT MERGE - Merge ab/7272582 am: 7bf03e4a7e

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

Change-Id: Ifb918f08ee2ca0b90c43c22704793292c496d0bd