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

* changes:
  Merge changes from topic "am-1a118fe584b54a8383edaaccdf95d928" into udc-d1-dev-plus-aosp am: b3b4ca14 -s ours
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-v2-dev am: 7806f3c6 -s ours am: e4b9774b -s ours am: 8c7af994 -s ours am: 76f4b352 -s ours am: c8810c33 -s ours am: b8a713ca -s ours