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

[automerger skipped] Merge "Improve user handling when querying for resumable media" into tm-dev am: 4e201835 am: 73552e29 -s ours am: 07c120aa -s ours am: 4f6e1b56 -s ours am: 0759710f -s ours am: 2cdd64b3 -s ours am: 582d2328 -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/+/23834726



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