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

[automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-v2-dev am: dd1fb1e5 -s ours

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

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



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