[automerger skipped] Merge "Revert "Verify URI permissions in MediaMetadata"" into tm-dev am: 3f7b95fcfd am: 43db61efb1 -s ours am: dcf2875640 -s ours am: 284032b926 -s ours am: f6b6454979 -s ours
am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 4ddfad255f is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23451199
Change-Id: I927c135cb9e3750597560799bae0d71b552c1364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: