Merge "DO NOT MERGE Verify URI permissions in MediaMetadata" into tm-dev am: ad697c41a1 am: 8641ffb675

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

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