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

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

Change-Id: Ife8d553f3a969a439611f6576b1175fa4f4017ce