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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cb47d90fdb9f03a61a76af50bd627a8bfdf696d