[automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-dev am: e597df6fd0 -s ours am: 41cce389fd -s ours am: 354583d7f1 -s ours am: 04b584c402 -s ours am: e48e6ed9f9 -s ours am: 7bcfc61d96 -s ours am: 510073965d -s ours am: d93648d055 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a0e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23834099
Change-Id: I2d4827125078a5d46f5a56d723ac5c4db9a4e919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: