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

* changes:
  Merge changes from topic "am-699b1fd04be64b0c8b946358be3efbbb" into udc-d1-dev-plus-aosp am: e6a4c18a -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: a408dfa0 -s ours am: ad24c8dc -s ours am: b0460119 -s ours am: 19f445a6 -s ours