Merge changes from topic "am-71531a99c0b14c8983ca9c32774be72a" into udc-d1-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: 20b0a7c3 -s ours am: 11917716 -s ours am: 42bd0924 -s ours am: 3d727598 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: 1f758ee3 -s ours am: f9cc4326 -s ours am: 77c2bc79 -s ours am: 4e275308 -s ours am: 391e2c15 -s ours am: ffd17088 -s ours