Merge changes from topic "am-516f971ef8c843efb2173f44d33d3071" into udc-qpr-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: 6fc543e3 -s ours am: 77875332 -s ours am: 12b4e275 -s ours am: 2144e848 -s ours am: 3e62c3d1 -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: f6add77c -s ours am: 57255ca0 -s ours am: a8786be0 -s ours am: 10bf669a -s ours am: 35af3ac0 -s ours