[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 735b898048 -s ours

am skip reason: Change-Id I1c93b79026c527984a1bec1506797703eb5e674d with SHA-1 2c13405951 is in history

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

Change-Id: Ie8d0e66ce274da76ec1f22c1bf5df49fd94330fa