[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: f0358fdeb0 -s ours am: bc15df8c4e -s ours am: d297b8410e -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie89d6e2b7efe698d618b3d93cd06a07122d0f4de