[automerger skipped] Merge "DO NOT MERGE Avoid path traversal in MediaProvider delete call" into sc-dev am: 39d7dcccd4 am: 4683c048ec -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: I598b040ba041191088717c3840ee1f47f28fb3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>