[automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions in...

[automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions in MediaMetadata"" into tm-qpr-dev am: 7213e92f -s ours am: ef231d66 -s ours am: dc9d1b2e -s ours am: 168c1824 -s ours am: f68c4705 -s ours

am skip reason: subject contains skip directive

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



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