Merge "Add media permissions to STORAGE_PERMISSIONS" into tm-dev am: cb723361

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



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