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

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-v2-dev am: 7806f3c6 -s ours am: e4b9774b -s ours am: 8c7af994 -s ours am: 76f4b352 -s ours am: 50f0866f -s ours am: fa945aec -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: 1f758ee3 -s ours am: f9cc4326 -s ours am: 7afccf21 -s ours am: f00ab085 -s ours am: 7471462f -s ours am: af4cd588 -s ours