[automerger skipped] Merge "Block SAF directory access to /sdcard/Android" into rvc-dev am: 246b270b am: 92f9646d -s ours am: f1b89ae4 -s ours am: 7f3f1dfb -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: I706afceec0786448f22524c0fc4a3663256108f6