tree db6bc71cf1daf0a2a2327e824c38265b6d16da16
parent 42bb52f7e62219ff815925aee2336a8e2b5464f2
parent ea9b9fc934e22a1216dcfd3a3373cf7ccdf4eacc
author Beth Thibodeau <ethibodeau@google.com> 1688987438 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1688987438 +0000

[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 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: I9141ca859a0fe5affaaa8ac11b454791324c0404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>