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

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



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