[automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-dev am: e675984c -s ours am: 1a214343 -s ours am: 6ac657ef -s ours am: a13e8f7c -s ours am: 791ffd50 -s ours am: b14a8f9b -s ours am: 15b5c817 -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 5eb60739 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23861644



Change-Id: Icf76d0d1a9983dea9aca15e0e230d4bd90435d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>