[automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-dev am: e675984c04 -s ours am: 1a214343af -s ours am: 6ac657ef80 -s ours am: a13e8f7c1f -s ours am: 791ffd50f7 -s ours am: b14a8f9b00 -s ours am: 1b43968904 -s ours

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

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

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