[automerger skipped] Merge "Improve user handling when querying for resumable media" into sc-v2-dev am: dd1fb1e5b7 -s ours am: 93b178dce7 -s ours am: ea9b9fc934 -s ours am: 53fbacd692 -s ours am: e35656dca8 -s ours am: e932eced74 -s ours am: c2d0ff8375 -s ours am: c88a3522f9 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 d61741288b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23860830
Change-Id: Iec3f56a596a4562af788f355e2de75be815501b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: