Merge changes from topic "am-686b94cbef17426c855faa4d4bc99333" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "am-2876cb49a01647d5b9d7e87219b708bf" into udc-dev am: 67b7ac80 -s ours am: 3ee9fb6b -s ours am: 7d4e76c6 -s ours
  [automerger skipped] Merge "Check URI permissions for resumable media artwork" into tm-dev am: 074556ad -s ours am: 236f1ec6 -s ours am: 03f16e09 -s ours am: 3bce7238 -s ours am: d6a8de7f -s ours