[automerger skipped] Improve user handling when querying for resumable media am: 684492a0df -s ours am: 3134c90f79 -s ours am: b0a33db6d6 -s ours am: e3b5c470b9 -s ours am: 779c9e902d -s ours am: 25fc1e7d44 -s ours

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

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

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