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

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

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

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



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