[automerger skipped] Improve user handling when querying for resumable media am: 5eb60739 -s ours am: cfa9b693 -s ours am: 75d61fab -s ours am: 6b59e072 -s ours am: 1a3b3222 -s ours am: 811c4471 -s ours

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

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



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