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: I14bae0c6d767cf1e609e13c07e516ab3e65d4116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>