[automerger skipped] DO NOT MERGE Avoid path traversal in MediaProvider delete call am: 9af1c783ee am: 13c1dfd91f -s ours am: fa4a51ae23 -s ours am: 4739d294a8 -s ours am: fd4a7ced68 -s ours

am skip reason: subject contains skip directive

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

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