[automerger skipped] Merge "Block SAF directory access to /sdcard/Android" into rvc-dev am: 246b270b am: 9aefabda -s ours am: e249d349 -s ours am: f228de41 -s ours

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

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

Change-Id: Ie0f2aeaf65d62801d8ed179d3122bb278c73bec4