Merge "Verify URI permissions in MediaMetadata" into rvc-dev am: 02a632ff37

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

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