[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: da9ce49d2d am: 3f6ad396be -s ours

am skip reason: Change-Id Ibd34bdd03ff2846d7b66e6621698e09f0d50b5a6 with SHA-1 4e476e34d2 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1486850

Change-Id: I95583d0b8898fadc13a79784e7521a0bcd774721