[automerger skipped] Merge "isDataOrObbPath blocks access to Android/[data|obb] dirs only" into rvc-qpr-dev am: 720d8be538 -s ours am: 410826b46c -s ours am: be7a392d41 -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/+/19085842

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