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

[automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6f -s ours am: 41cce389 -s ours am: 354583d7 -s ours am: 04b584c4 -s ours am: e48e6ed9 -s ours am: 7bcfc61d -s ours am: b1e152fd -s ours am: e3164c7d -s ours am: 50e563fd -s ours am: 45abac95 -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: Id527192c6293ee127190b24fb61dc605ab6c3c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>