Merge mainline-release 6664920 to master - DO NOT MERGE am: 48120deb3b

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

Change-Id: I1920647fd51e10f1ec0326e9542bef5522e2f20e