[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: 2cb5509b8f -s ours am: fbbe04d6d4 -s ours am: ae7a7c355c -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: I135e2bd57f235ef23d3d9196d40648a48e459eb6
Signed-off-by: Automerger Merge Worker <[email protected]>