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