[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 09ec386be0 am: 0f08097c7f -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: I5f53a6677612b250986ee0a294c2875b336b6e80