Merge changes from topic "am-91f34c8b6884482e8ce0f1d44f4f1a1b" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into rvc-qpr-dev am: 0103e314 -s ours am: f3e578fb -s ours am: 6e5dd607 -s ours am: 0f25ed87 -s ours am: e7e81fff -s ours am: 4bedceb9 -s ours am: 4030ae7d -s ours am: 260b4057 -s ours am: bc82f11e -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: 552ec325 -s ours am: 8c44f21e -s ours am: 2f53da44 -s ours am: 861e16f7 -s ours am: 59a2e7a8 -s ours am: 23cb85e9 -s ours am: 6b3fd44b -s ours am: b8ce472e -s ours am: c7365567 -s ours