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

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

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

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