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

Merge "[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into sc-dev am: 2a93c53d am: 18a0a092 am: db86e3e4 -s ours am: 9a0b3244 -s ours am: 8ed92ef8 -s ours am: f6639943 -s ours am: 063f9998 -s ours am: 2a4158a6 -s ours" into udc-qpr-dev-plus-aosp am: eebea138 -s ours

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

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



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