[automerger skipped] Improve user handling when querying for resumable media am: 8dccce4f51 -s ours am: 3527030292 -s ours am: d8080f187c -s ours am: 050f2c7b2f -s ours

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

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

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