Merge changes from topic "am-4a99d14ffae144dd9dfb798b6f93225d" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-dev am: 055c43b6 -s ours am: cdbede64 -s ours am: ff6c98c1 -s ours am: ac22d32d -s ours am: eee32d18 -s ours am: d3abc510 -s ours am: 8cb6c015 -s ours am: 8a029677 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: ffae193f -s ours am: 49281f21 -s ours am: 41bdc6c2 -s ours am: 2c2f9d6e -s ours am: 7dc7566a -s ours am: 8dba7828 -s ours am: 7f57a056 -s ours am: 1fba186f -s ours