[automerger skipped] [DO NOT MERGE][conflict] Fix path traversal vulnerabilities in MediaProvider am: 5d2808f30c am: 890c220827 am: 20f1de480d am: 41903182a3 -s ours am: bf766a3310 -s ours am: 3f1934ff36 -s ours

am skip reason: subject contains skip directive

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

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