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

* changes:
  Merge changes from topic "am-499dc9cadcc44270b0bb558e28ecbe88" into udc-d1-dev-plus-aosp am: 3432a498 -s ours
  [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-v2-dev am: dd1fb1e5 -s ours am: 93b178dc -s ours am: ea9b9fc9 -s ours am: 53fbacd6 -s ours am: d006be29 -s ours am: b64f1e48 -s ours am: e412cd40 -s ours