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

[automerger skipped] Improve user handling when querying for resumable media am: 4d10ae5a -s ours am: 28203b96 -s ours am: 6f8b219e -s ours am: 8233aa71 -s ours am: cffddc61 -s ours am: 47b9802d -s ours am: c5a45d4b -s ours am: 3da27b22 -s ours

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

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



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