Merge "Merge "Improve user handling when querying for resumable media" into...

Merge "Merge "Improve user handling when querying for resumable media" into udc-qpr-dev am: 706aef53" into udc-qpr-dev-plus-aosp am: dfebad3f

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



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