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

[automerger skipped] Improve user handling when querying for resumable media am: 4d10ae5a -s ours am: 28203b96 -s ours

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

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



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