Merge "DO NOT MERGE Avoid path traversal in MediaProvider delete call" into sc-dev am: 39d7dcccd4

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

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