Bug: 292141694
Test: ./ravenwood/scripts/ravenwood-stats-collector.sh
    and examine the generated files
Change-Id: I3ea52f20ca54644f3ab724f23ae3e8f0e08e269f

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



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

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



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

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



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

Merge "Reduce votePreferredFrameRate calls in View and enable velocity mapping for ScrollView" into main

[automerger skipped] Merge "Create a flag for rescue party flag resets" into main am: dc21a049 am: 9d1a6c06 -s ours

am skip reason: Merged-In Id06f6a076db8fbe9dc5d4d17170f819f8f472bd5 with SHA-1 45637a05 is already in history

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



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

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



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

When an app passes an invalid icon into a BigPictureStyle notification,
we want to know clearly and promptly, so log when we see those icon
loads fail.

Bug: 335878768
Test: manual
Flag: NONE
Change-Id: If7080cdc6876ef9174af344c79e23ab41f057fd4

Merge "UserManagerService：getUserDataLU method should called by mUsersLock lock." into main am: 9f425078 am: b516b591

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



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

Merge "UserManagerService：getUserDataLU method should called by mUsersLock lock." into main am: 9f425078

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



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

Flipping the old flag turned it on in old builds (where the
experience is not ready yet); changing the flag name and re-rolling it
out.

Bug: 329659738
Flag: NONE
(changes now flagged under com.android.systemui.screenshot_shelf_ui2)
Test: manual (device with the old flag has the old UI; flipping the new
flag gets the new (and not broken) UI)

Change-Id: I8250035bf8d33b977088a7aa748d780de306a7e0

Merge "[flexiglass] Add start order dep from SysuiStatusBarStateController on CentralSurfaces" into main

[automerger skipped] Merge "Move AudioService recv off of main thread" into 24D1-dev am: df3c0a58 -s ours

am skip reason: Merged-In Ibc6b95f7bd628a63c565adfa7f5d52cdcda9fb1b with SHA-1 b7c3f048 is already in history

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



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

am skip reason: Merged-In Ibc6b95f7bd628a63c565adfa7f5d52cdcda9fb1b with SHA-1 b7c3f048 is already in history

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



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

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



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

... when face unlock happens fast, before the transition
to ALTERNATE_BOUNCER completes. This matches the logic
for every other transition.

And move the tests to be multivalent

Fixes: 335285286
Test: atest KeyguardTransitionScenariosTest
Flag: N/A
Change-Id: Id16d92a57b19c6664abb029397c0798c8c9e1507