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

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

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