Merge "Add media perms to DefaultPermissionGrantPolicy" into tm-dev am: 27817f0b54

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

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