[automerger skipped] Merge "DO NOT MERGE Avoid path traversal in MediaProvider delete call" into sc-qpr1-dev am: a824cdf529 -s ours

am skip reason: subject contains skip directive

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

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