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

[automerger skipped] Improve user handling when querying for resumable media am: 8dccce4f -s ours am: 35270302 -s ours am: d8080f18 -s ours am: 050f2c7b -s ours am: 5f0c43aa -s ours am: f96b9295 -s ours am: 28ed60ed -s ours am: e91e268a -s ours am: 3e9003e5 -s ours am: fb2ef264 -s ours

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

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



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