Merge changes from topic "am-846861bf62dc4a95a0f7be83935bb5a1" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Verify URI permissions in MediaMetadata" into tm-qpr-dev am: 3dcb6e59 -s ours am: c493f2b2 -s ours am: 7f1fcfe0 -s ours am: cbaa6b8e -s ours
  [automerger skipped] Verify URI permissions in MediaMetadata am: 4ddfad25 -s ours am: f27f5f29 -s ours am: 309ee1f3 -s ours am: 402e5e41 -s ours