[automerger skipped] Improve user handling when querying for resumable media...

[automerger skipped] Improve user handling when querying for resumable media am: 684492a0 -s ours am: 3134c90f -s ours am: b0a33db6 -s ours am: e3b5c470 -s ours am: 779c9e90 -s ours

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

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



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