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

* changes:
  [automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-qpr-dev am: 3b8eb303 -s ours am: 8bcc2965 -s ours am: 4c58d503 -s ours am: 92019fc0 -s ours am: 3a5c79c3 -s ours am: ddb8d9e6 -s ours am: 8ff98e96 -s ours am: cbba85d2 -s ours am: 649ef504 -s ours am: e6ac1838 -s ours
  [automerger skipped] Improve user handling when querying for resumable media am: 4d10ae5a -s ours am: 28203b96 -s ours am: 6f8b219e -s ours am: 8233aa71 -s ours am: cffddc61 -s ours am: 47b9802d -s ours am: c5a45d4b -s ours am: 3da27b22 -s ours am: 103548b0 -s ours am: 6ebc0c9e -s ours