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

[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into tm-qpr-dev am: 3dcb6e59 -s ours am: c493f2b2 -s ours

am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 f2142c80 is already in history

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



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