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

[automerger skipped] Improve user handling when querying for resumable media am: 684492a0 -s ours am: 3134c90f -s ours am: b0a33db6 -s ours am: e3b5c470 -s ours am: 779c9e90 -s ours am: 25fc1e7d -s ours am: 9699b871 -s ours am: 51b54688 -s ours am: 3427f2a5 -s ours am: a0ba53fd -s ours am: caa4c897 -s ours am: 3a031160 -s ours

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

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



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