[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into tm-qpr-dev am: 3dcb6e596a -s ours am: c493f2b239 -s ours
am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 f2142c8067 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23174497
Change-Id: I8494a0953c9e790d7014be1f2f3941d13072e3c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: