[automerger skipped] Merge "Add per-media-type logging for deletion" into mainline-prod am: 89535520ff -s ours

am skip reason: skip tag Change-Id I87152e2fef5c8e5b59c8de4e07acb33a19eacdd7 with SHA-1 5ff614ecb6 is already in history

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

Change-Id: I32d879fdd84049d5640f55540edb1211bd3e4ede