[automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE am: 2bd362e2cb -s ours am: 4e476e34d2 -s ours

am skip reason: Change-Id I1653a75056ff6d5fedb1c23cd19cd36e16220a83 with SHA-1 3893cc5f56 is in history

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

Change-Id: I02d0ec5732c7d8e3f37a1321a5f094b0e8b300d3