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

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into rvc-dev am: e48d7291 -s ours am: 2d941b08 -s ours am: 99ae2106 -s ours am: b9ab54d7 -s ours am: 4dd7b2cf -s ours am: 1cb821ba -s ours am: 73f12505 -s ours am: 459e0fbe -s ours am: 37193043 -s ours am: 9f6230f5 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: c13567e3 -s ours am: 7cb8ef75 -s ours am: 4136b7d0 -s ours am: 31d6e224 -s ours am: 536c9315 -s ours am: 26af5245 -s ours am: 76284441 -s ours am: 1faf9bc9 -s ours am: 3fae19ab -s ours am: 0832cf97 -s ours