Merge changes from topic "am-0280e18f58e5493eb36957cce7121d83" into udc-qpr-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: c76d085f -s ours am: 4bea2c5f -s ours am: c980b03c -s ours am: 2ae5e3bb -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: fb9814a5 -s ours am: 9abf07e1 -s ours am: 7208e4b8 -s ours am: a39d87a0 -s ours