Merge "[automerger skipped] Merge "Play SLEEP transitions if they contain changes" into udc-qpr-dev am: 2985ffb9 am: 70370017 -s ours" into main

[automerger skipped] Merge "Play SLEEP transitions if they contain changes" into udc-qpr-dev am: 2985ffb9 am: 70370017 -s ours

am skip reason: Merged-In I4bbaa8ad033aaadcb1c0b54889b7c81fb003b001 with SHA-1 ce1a438c is already in history

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



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

Merge "[automerger skipped] Merge "Add a configuration to enable or disable support for repair mode" into udc-dev-plus-aosp am: 62eb14b8 am: ecc9ce72 -s ours am: 233588b9 -s ours" into main

[automerger skipped] Merge "Add a configuration to enable or disable support for repair mode" into udc-dev-plus-aosp am: 62eb14b8 am: ecc9ce72 -s ours am: 233588b9 -s ours

am skip reason: Merged-In I6217b00b488851c63f3249c74ca2b64ace29806f with SHA-1 37f2d128 is already in history

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



Change-Id: I973a3fbc4293d323e61830c2c10ae7f89b17e776
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/+/25057592



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

[automerger skipped] Merge "Add a configuration to enable or disable support for repair mode" into udc-dev-plus-aosp am: 62eb14b8 am: ecc9ce72 -s ours

am skip reason: Merged-In I6217b00b488851c63f3249c74ca2b64ace29806f with SHA-1 37f2d128 is already in history

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



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

* changes:
  Don't update face auth locked out state if face auth is not enabled or enrolled
  Add isFaceEnrolledAndEnabled method to the interactor to allow KeyguardUpdatMonitor to read the state

Merge "Add a configuration to enable or disable support for repair mode" into udc-dev-plus-aosp am: 62eb14b8

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



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

* changes:
  Store aggregated power stats in PowerStatsStore
  Add PowerStatsStore for aggregated PowerStats spans
  Capture wallclock time in aggregated power stats
  Add monotonic clock

[automerger skipped] Merge "Re-write conditional checks for animation" into udc-qpr-dev am: 3148e971 am: 45c5fd10 -s ours

am skip reason: Merged-In Iebda8c9acfbf75a49522887687702b2e8c0158de with SHA-1 9bc94e9c is already in history

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



Change-Id: Id8daea3366658eb575dacaccfdb68178f771c450
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/+/25009816



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

Merge "Javadoc update: hotword detection service -> {@link HotwordDetectionService} visual query detection service -> {@link VisualQueryDetectionService} trusted -> sandboxed" into main