[automerger skipped] Merge "DO NOT MERGE Avoid path traversal in MediaProvider delete call" into sc-dev am: 39d7dcccd4 am: 8782fa365d -s ours am: 03445e0091 -s ours

am skip reason: subject contains skip directive

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

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