Merge "Import android-non-updatable artifacts for API 30" into rvc-dev