Merge "Revert "Verify URI permissions in MediaMetadata"" into tm-dev am: 3f7b95fcfd

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

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