[automerger skipped] Merge changes from topic "revert-15398814-TAMEQDKRQU" into sc-dev am: 0d933eedb6 -s ours

am skip reason: Merged-In I2160de16db7ca43220120e7d4f757a4573a3289b with SHA-1 d52e4aba86 is already in history

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

Change-Id: Icefa0785d92845d5e14b7cf0f5d204115a4d215a