[automerger skipped] Merge changes from topic "presubmit-am-355c0e8e7c35452d92b25e6e1a76eb99-sc-dev" into sc-mainline-prod am: 6feb011ba7 -s ours

am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 4f46f26267 is already in history

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

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