Merge "Skip test unless ro.vendor.api_level >= 30" into udc-dev