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

* changes:
  [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-dev am: e675984c -s ours am: 1a214343 -s ours am: 6ac657ef -s ours am: a13e8f7c -s ours am: 4ad8de3a -s ours am: 72fba627 -s ours am: a2915ecd -s ours am: 58e1cef6 -s ours am: 3f0996c2 -s ours
  [automerger skipped] Improve user handling when querying for resumable media am: 8dccce4f -s ours am: 35270302 -s ours am: d8080f18 -s ours am: 050f2c7b -s ours am: 5f0c43aa -s ours am: f96b9295 -s ours am: d484ea15 -s ours am: a161edc1 -s ours am: 426a2462 -s ours