Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: da9ce49d2d

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

Change-Id: I95309de8282bb1facea77a662a28c0e49d8337f4