Merge changes from topic "am-a5d378f30fe64a91ae15b36dee056d2c" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-qpr1-dev am: 3554a4a7 -s ours am: 5db6d9c6 -s ours am: a364fe8a -s ours am: e4393a77 -s ours am: 6b085f53 -s ours am: 03532ef8 -s ours
  [automerger skipped] Improve user handling when querying for resumable media am: 5eb60739 -s ours am: cfa9b693 -s ours am: 75d61fab -s ours am: 6b59e072 -s ours am: 1a3b3222 -s ours am: b974fdc2 -s ours