Merge "Improve user handling when querying for resumable media" into tm-dev am: 4e201835

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



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