[automerger skipped] Merge "Merge RQ2A.210305.007" am: 2d207c27aa -s ours am: 198cb7fe21 -s ours

am skip reason: Change-Id I547d19f2996e545eb1882925daa57db6f9d5f64c with SHA-1 830ca8dc50 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id340f4f5f44fd28ec652d5aeb94f1c1d04128f9d