Merge cherrypicks of ['googleplex-android-review.googlesource.com/24079606'] into udc-release. am: 4bc56dd095

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

Change-Id: Ic8075302afb939552d060504f52ac0c725384d96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>