Merge changes from topic "am-2cd577b60ab642c08a2b360ed6207496" into udc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into rvc-qpr-dev am: 0103e3149d -s ours am: f3e578fbc9 -s ours am: 6e5dd607dc -s ours am: 0f25ed8718 -s ours am: e7e81fffc6 -s ours am: c76d085fc3 -s ours am: 4bea2c5f09 -s ours am: f2d89b5138 -s ours
[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: 552ec32590 -s ours am: 8c44f21e56 -s ours am: 2f53da441c -s ours am: 861e16f704 -s ours am: 59a2e7a8db -s ours am: fb9814a51f -s ours am: 9abf07e125 -s ours am: a7334b886d -s ours