[automerger skipped] Improve user handling when querying for resumable media am: 01d527cd -s ours am: 86e326bf -s ours am: 9551e717 -s ours am: d34c9fb4 -s ours

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

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



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