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

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



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