[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: 308dca55 -s ours am: 73a58abf -s ours am: b80ed8f5 -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: Iceaddab9891472e34055390d186eb25420e8644f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>