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

* changes:
  [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6f -s ours am: 41cce389 -s ours am: 354583d7 -s ours am: 04b584c4 -s ours am: e48e6ed9 -s ours am: 7bcfc61d -s ours am: b1e152fd -s ours am: e3164c7d -s ours am: 602e7983 -s ours am: dbd21b7f -s ours
  [automerger skipped] Improve user handling when querying for resumable media am: 684492a0 -s ours am: 3134c90f -s ours am: b0a33db6 -s ours am: e3b5c470 -s ours am: 779c9e90 -s ours am: 25fc1e7d -s ours am: 33a18d8b -s ours am: 570b5f5b -s ours am: fffc2002 -s ours am: a51ee6f8 -s ours