Merge "Disallow external storage access without restricting other api calls"...

Merge "Disallow external storage access without restricting other api calls" into tm-dev am: 5f0c868b am: c545627a am: 43be4033 am: 4ddc391c

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



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