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

* changes:
  Merge changes from topic "am-7e96eae02a5b484e9919093ff21ef7d9" into udc-d1-dev-plus-aosp am: df9f6dce -s ours
  [automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-qpr1-dev am: 3554a4a7 -s ours am: 5db6d9c6 -s ours am: a364fe8a -s ours am: 6fc543e3 -s ours am: 77875332 -s ours am: 12b4e275 -s ours am: 2144e848 -s ours am: 3d2ca630 -s ours