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

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

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