Merge "[automerger skipped] Merge "Check URI permissions for resumable media artwork" into udc-dev am: 80a36bf714 am: 0776a21aa7 -s ours am: 0062109fe6 -s ours" into udc-qpr-dev-plus-aosp