Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 09ec386be0

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

Change-Id: I2c78f10598f0ec19ee1460432f75bf500c64d3d3