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

* changes:
  [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
  [automerger skipped] Improve user handling when querying for resumable media am: b7e77454 -s ours am: f3a6731f -s ours am: b8d84783 -s ours am: 42bb52f7 -s ours am: ef6c6cc5 -s ours am: c173a707 -s ours