[automerger skipped] Merge "Block SAF directory access to /sdcard/Android"...

[automerger skipped] Merge "Block SAF directory access to /sdcard/Android" into rvc-dev am: 246b270b am: 92f9646d -s ours am: f1b89ae4 -s ours

am skip reason: Merged-In I93aea7cd5d3b7befea1f78e1cf3f31f8250f1d33 with SHA-1 9d508579 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14800511

Change-Id: Id4dc2b6bd7cfb6ba6d08bd22ecc18dcf1131ad4e