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

[automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-qpr-dev am: 3b8eb303 -s ours am: 8bcc2965 -s ours am: 4c58d503 -s ours am: 92019fc0 -s ours am: 3a5c79c3 -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: Ia74a3ae81d9644bc55097ec1219336650ab0855e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>