[automerger skipped] Merge "isDataOrObbPath blocks access to Android/[data|obb] dirs only" into sc-dev am: ffdfe37d14 -s ours am: f2685f2bf0 -s ours

am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 13e6a6fb58 is already in history

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

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