[automerger skipped] Improve user handling when querying for resumable media...

[automerger skipped] Improve user handling when querying for resumable media am: 01d527cd -s ours am: 86e326bf -s ours am: 9551e717 -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: I8b7096f17dd5fe4b7b6c8ad5765ca4e2cd3b5f1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>