Merge "Improve handling of android auto classes." am: 1de2d692ea am: 3b4155d65a

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

Change-Id: Ibf00e30962526b918b210cf665f691214395bc5a