Merge "Skipping test on GSI + first_api_level < U" into main am: 8c8cf28a2a am: b0870bbeaf

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

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