[automerger skipped] Merge RQ2A.210305.007 am: 4312685c7b -s ours

am skip reason: Change-Id Iea3f9a4a47d7f00417a56b5fc297b0e5d7e90053 with SHA-1 6fb212a789 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/libs/+/1613657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ead73fe2541b5ddefafdadb3374d19b97cfa91e