[automerger skipped] Merge RQ2A.210305.007 am: 4312685c7b -s ours am: 17076c1482 -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: I4a75fc6fa7f61477e79c4dc272fe8119794a868f