Merge changes from topic "am-7de252f86fad434daeb5ed1d2f2aee79" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-qpr1-dev am: da4914d6 -s ours am: 87340e33 -s ours am: 093de6a9 -s ours am: 3902f5d1 -s ours am: cae054df -s ours am: 0df0a41f -s ours am: 44b732fa -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: b45a5190 -s ours am: bf7d1e96 -s ours am: cf147360 -s ours am: 2f3891a7 -s ours am: b9544260 -s ours am: 17927d59 -s ours am: ca8a548c -s ours