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

[automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-dev am: e675984c -s ours am: 1a214343 -s ours am: 6ac657ef -s ours am: a13e8f7c -s ours am: 4ad8de3a -s ours am: 72fba627 -s ours

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

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



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