* changes:
  [Sb] Implement the unified battery inside of BatteryMeterView
  [Sb] Attribution vector definitions for unified battery drawable
  [Sb] New unified battery icon
  [Sb] New status bar wifi and mobile icons

[automerger skipped] Merge "Re-enable ElementTest#elementIsReusedBetweenScenes" into aosp-main-future am: cdd45525 -s ours

am skip reason: Merged-In I7540b3265d501c086cd39e7e6f57309fb702abfb with SHA-1 08e50b87 is already in history

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



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

am skip reason: Merged-In I7540b3265d501c086cd39e7e6f57309fb702abfb with SHA-1 08e50b87 is already in history

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



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

* changes:
  Don't remove the UdfpsView if it hasn't been added yet.
  Use KeyguardTransitions instead of PowerInteractor's wakefulness state

Bug: 273591201
Test: m
Flag: None
Change-Id: Iebcbcc2883420c8fb1976acd42d069ee65034f07

* changes:
  [1/n] Remove use of `persist.wm.debug.desktop_mode_2`
  [1/n] Replace read-only desktop windowing flag with runtime flag

Merge "Ringtone picker to handle RESULT_CANCELED from Add ringtone" into main am: 3bd28b58 am: ca6f28e8

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



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

Create necessary hooks for desktop to fullscreen keyboard shortcut.
Since both desktop to fullscreen and split to fullscreen will be using
the same keyboard shortcut combine both on the StatusBarManager side as
moveFocusedTasktoFullscreen.

Test: atest DesktopTasksController
Test: Manually trigger the shortcut to move from desktop to fullscreen
Test: Manually trigger the shortcut to move from split to fullscreen
Bug: 326061209
Flag: ACONFIG com.android.wm.shell.enable_desktop_windowing DEVELOPMENT
Change-Id: Ic5f8af23f55e30c971c115a20960f7336beb8629

Bug: 308673538
Test: N/A, documentation change only.
Change-Id: I0518b5af6697075e4a92fc7f1d48a06a149df4fc

Prevent a flicker when the shade is expanded and the user
hits the power button. This will perform an eased fade out.

Fixes: 326228196
Test: atest SharedNotificationContainerViewModelTest
Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint
STAGING

Change-Id: Ifd8afb3de2a21e779e1b0bbbeafb26c7007c3128