[automerger skipped] Merge "Improve user handling when querying for resumable media" into tm-qpr-dev am: f530a813 am: 025bcdb3 -s ours am: 2a88d125 -s ours am: b35779a0 -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 01d527cd is already in history

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



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