[automerger skipped] Improve user handling when querying for resumable media am: 8dccce4f -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: I87c511e4baac95b23cc30055b781258019ebb7eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>