[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: b21833b8 -s ours am: 4b7f0987 -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: I3fd2a85ba35972a3997814f5074e7d89e20b5d3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>