Merge changes from topic "am-3be6d6c2f90748918b56ded29d1fff32" into udc-dev-plus-aosp
* changes: [automerger skipped] Merge "Verify URI permissions in MediaMetadata" into tm-qpr-dev am:3dcb6e596a-s ours am:c493f2b239-s ours [automerger skipped] Verify URI permissions in MediaMetadata am:4ddfad255f-s ours am:f27f5f29fc-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
991c1d32fa