Merge "Skip test unless ro.vendor.api_level >= 30" into udc-dev am: c73ad87f am: 91cc9f49

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22097764



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