[automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-qpr-dev am: 3b8eb303 -s ours am: 8bcc2965 -s ours am: 4c58d503 -s ours am: 92019fc0 -s ours am: 3a5c79c3 -s ours am: 345ee0b6 -s ours am: 7ac86c35 -s ours am: 31b6c684 -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 8dccce4f is already in history

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



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