Merge "Disallow external storage access without restricting other api calls" into tm-dev am: 5f0c868b am: f2180657 am: e4fd8eb3

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



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