Merge changes from topic "am-c04d95d6ff114f769d41d79b819b07f8" 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: 3b473b01 -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: ac4d2cf6 -s ours