Merge changes from topic "am-c5ec16bd9ddd4a4b98e3002bb6f376e2" into udc-d1-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: e2a0b727 -s ours am: f4feb1e9 -s ours am: 373c2479 -s ours am: 531fe349 -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: 77ff4dce -s ours am: c67aa2ea -s ours am: c7e6061a -s ours am: ca8ef50b -s ours