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

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



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