[automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions in MediaMetadata"" into tm-qpr-dev am: 7213e92fca -s ours am: 3f9d8cca45 -s ours am: fedf8ba85b -s ours

am skip reason: subject contains skip directive

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

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