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

[automerger skipped] Merge "DO NOT MERGE Verify URI permissions in MediaMetadata" into tm-dev am: ad697c41 am: 8641ffb6 am: 5a97d6c3 -s ours am: 44a8b4dc -s ours am: fa7eccd8 -s ours

am skip reason: subject contains skip directive

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



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