Merge "Block SAF directory access to /sdcard/Android" into rvc-dev am: 246b270b40

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

Change-Id: Ied6b2e6c4efb41895a0280c770a0e49b5e0bd40f