[automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-qpr-dev am: 3b8eb303ff -s ours

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

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

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