[automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE am: 2bd362e2cb -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: Ibd34bdd03ff2846d7b66e6621698e09f0d50b5a6