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