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

* changes:
  Merge changes from topic "am-2cd577b60ab642c08a2b360ed6207496" into udc-d1-dev-plus-aosp am: 7b6faa5b -s ours
  [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: f2d89b51 -s ours am: ad6d6127 -s ours