[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 09ec386be0 am: 0f08097c7f -s ours am: 6f8ee22c4b -s ours am: 3593bb1f0d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I77096ccdc8b7e4502889ab4bc359759c8051c2df