Change-Id: Ie3ddd04853bb3471bb60cefd037d5244733046c4
Test: Built, presubmit

am skip reason: Merged-In I9c30335c28c96a2fe47cb5a4c355e4a68c44cee6 with SHA-1 0310424e is already in history

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



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

am skip reason: Merged-In I9c30335c28c96a2fe47cb5a4c355e4a68c44cee6 with SHA-1 0310424e is already in history

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



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

Bug: 329020494
Change-Id: Idd32fb28bd5f75f1c97dbd324ab80f020b49d504
Test: rebuild

Test: no need
Bug: 320419200
Change-Id: I6c894080bf476fb21773e2a44ef1f67ca37e4347

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



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

[automerger skipped] Merge "SpatializerHelper: assimilate speaker safe to speaker device for SA compatibility" into 24D1-dev am: c8af2e8d -s ours

am skip reason: Merged-In Id5d48427ff4ecef02a01a6e7fe46c5f910825e81 with SHA-1 e7b122ac is already in history

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



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

[automerger skipped] SpatializerHelper: assimilate speaker safe to speaker device for SA compatibility am: 25845858 -s ours

am skip reason: Merged-In Id5d48427ff4ecef02a01a6e7fe46c5f910825e81 with SHA-1 e7b122ac is already in history

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



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

[automerger skipped] Merge changes If525186a,I01ff7558,I2c1efbf1,Ieff77331 into 24D1-dev am: e0272690 -s ours

am skip reason: Merged-In If525186a81d896b8b3420f478045912e2a3771aa with SHA-1 e5d6da0c is already in history

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



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

am skip reason: Merged-In If525186a81d896b8b3420f478045912e2a3771aa with SHA-1 e5d6da0c is already in history

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



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

Merge "SpatializerHelper: assimilate speaker safe to speaker device for SA compatibility" into 24D1-dev

Although speaker safe is a mono device and should not be compatible with
transaural spatilization, we consider it is to avoid transient SA availability
changes propagated to apps that would cause failures to play SA content.
This can happen for instance if ringtone playback is still active when
the onRoutingUpdated() calback is called by APM due to an audio mode change.

A better longer term solution would be to trigger the onRoutingUpdated()
callback more dynamically each time the media routing changes but the
impact on performance and other consumers of this callback must be investigated.

Bug: 331349123
Test: repro steps in the bug
Change-Id: Id5d48427ff4ecef02a01a6e7fe46c5f910825e81
Merged-In: Id5d48427ff4ecef02a01a6e7fe46c5f910825e81

* changes:
  Update shelf screenshot UI entrance animation
  Fix back gesture/dismiss button in screenshot shelf UI
  Don't remove background task immediately on screenshot service end
  Add swipe dismissal for screenshot shelf view

[automerger skipped] Merge "Request face auth on posture change to OPENED" into 24D1-dev am: 50c36bfd -s ours

am skip reason: Merged-In I18bb85ba8225272246a14034358c25d682893de1 with SHA-1 5e493070 is already in history

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



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

am skip reason: Merged-In I18bb85ba8225272246a14034358c25d682893de1 with SHA-1 5e493070 is already in history

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



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

Merge "Document that only the currently preferred service can enable and disable observe mode" into main

* changes:
  Extract GlowPie to avoid code repetition.
  Add GlowPieEffect (first pass)

Bug: 329306344
Test: atest AodBurnInViewModelTest. Maunally test by clicking power
button on lockscreen with AOD settings on, observed non weather large clock scaled down without translating horizontally; tested weather clock with flashlight on, observed that all elements moved vertically with smartspace without scaling.
Flag: ACONFIG com.android.systemui.compose_lockscreen DEVELOPMENT

Change-Id: I2576b5b5c5537f880eabb843d5371939bc9bdeb6

Merge "Offhost NFC services shouldn't be able to register non-autotransact polling loop filters" into main

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



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