[automerger skipped] Merge "Revert "Verify URI permissions in MediaMetadata""...

[automerger skipped] Merge "Revert "Verify URI permissions in MediaMetadata"" into tm-dev am: 3f7b95fc am: 43db61ef -s ours am: dcf28756 -s ours am: 1c0f36cc -s ours am: 1eae5c8b -s ours

am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 4ddfad25 is already in history. Merged-In was found from reverted change.

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



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