[automerger skipped] Merge "Improve user handling when querying for resumable media" into udc-dev am: c43c0104 am: 09e96759 -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 116274d8 is already in history

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



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