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

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

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

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