[automerger skipped] Improve user handling when querying for resumable media am: b7e77454e8 -s ours am: f3a6731fea -s ours am: 4ad8444d9e -s ours

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

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

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