[automerger skipped] Merge "Improve user handling when querying for resumable...

[automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-qpr1-dev am: 3554a4a7 -s ours am: 5db6d9c6 -s ours am: a364fe8a -s ours am: e4393a77 -s ours am: 6b085f53 -s ours am: 03532ef8 -s ours

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

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



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