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

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

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

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