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

Change-Id: I83d6da3f1d1c39f69a0ca7e2fd8cc7c1a1a5d214