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

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-qpr1-dev am: da4914d6 -s ours am: 87340e33 -s ours am: 093de6a9 -s ours am: 74e720fe -s ours am: 417e556b -s ours am: a9dff7e7 -s ours am: 45bb7d32 -s ours am: 8134abf8 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: b45a5190 -s ours am: bf7d1e96 -s ours am: cf147360 -s ours am: 7e4150a5 -s ours am: 196a69e2 -s ours am: a9a65cd6 -s ours am: 8c5b9b28 -s ours am: d120e1c8 -s ours