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

am skip reason: skip tag Change-Id I75ac09abf1fad467cddb8aaed7632d34c69bb9f8 with SHA-1 1c003d125e is already in history

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

Change-Id: I375e5376776b3347f40483f853830f7c8a4f28ef