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

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

Change-Id: I531db9c50ed81e824d44b5fded67f26dbf5989c7