[automerger skipped] Merge "Improve user handling when querying for resumable media" into tm-qpr-dev am: f530a813 -s ours am: c417fbff -s ours am: 9259a5fc -s ours am: 4ff70429 -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 116274d8 is already in history

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



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