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

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



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