[automerger skipped] isDataOrObbPath blocks access to Android/[data|obb] dirs only am: d9c00e2457 -s ours am: c6a769d07b -s ours am: a83bc72290 -s ours am: 807cabcd1f -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: Ib5c0899263a06784c7fe888369da9002ffef372d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>