Merge "Avoid skipping test if it's supported." into udc-dev am: 6f14da4e93 am: 6e13aa44f6

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23696544

Change-Id: Id1a356e9a807b43ff14fa2656dad268565e82932
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>