[automerger skipped] Merge RQ2A.210305.007 am: 3f61c3a433 -s ours am: 06e3bbde2e -s ours

am skip reason: Change-Id Ia312566ae2082f2d813401d0e54ec785ffc0e171 with SHA-1 2b3984f394 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3e043514ebffdc8cf84cce6130177a0819f04ea