[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into rvc-dev am: 02a632ff37 am: a2212c18cb -s ours am: b145277797 -s ours

am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 b8a7fd8e6f is already in history

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

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