Merge "Disallow external storage access without restricting other api calls" into tm-dev am: 5f0c868b am: c545627a am: 610671a5 am: af3cdd3e

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



Change-Id: I246d0628d3a347a71f0dff9d05872bc540b259b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>