Merge "Fix car CtsVerifier bug" am: 4c3c25240f am: a8723879bc

Original change: https://android-review.googlesource.com/c/platform/cts/+/1521118

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibbea614da1a38eb27e5a40ac6ddcd7bb1391e8c4