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