Merge "Verify URI permissions in MediaMetadata" into tm-dev am: 9babf1a67a

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

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