[automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: 1c003d125e -s ours am: 6b50ef3a26 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I201f156ba22fc42b7ada85034c9090e9ecd53c36