Merge "Improve user handling when querying for resumable media" into udc-dev am: c43c0104

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



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