Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 167aa5da4d

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

Change-Id: Ia591bc4a3e683911e0b566b24d099e07f51d5340