Merge "Import android-non-updatable artifacts for API 30" into rvc-dev am: 8d4aedf6cf am: 156639406b

Change-Id: I66cb27f72d89f2c2499326c3d1ab4040fd729332