[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into sc-dev am: 2a93c53d21 am: 18a0a0920f am: db86e3e4cd -s ours am: 9a0b3244a2 -s ours am: 8ed92ef833 -s ours am: f663994367 -s ours
am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 01f65561df is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23207574
Change-Id: Ic5b20c5423baf682ad5cfdb7712f75e6ca6ef5ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: