Merge changes from topic "am-bcabb9dd98ca4156b5b18dd3d210a081" into tm-qpr-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
  [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