[automerger skipped] Improve user handling when querying for resumable media am: 5eb6073925 -s ours am: cfa9b693b9 -s ours am: 75d61fabcf -s ours am: f6add77cdb -s ours

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

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

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