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>

[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

This CL improves addRemoteInput logs and make similar them to removeRemoteInputs.

Example output:
1. addRemoteInput reason:RemoteInputView#focus entry: key, style:BigTextStyle ..
2. removeRemoteInput reason: RemoteInputViewController#sendRemoteInput entry:key, style: BigTextStyle ..
3. removeRemoteInput reason: RemoteInputView#onDefocus entry: key, style: BigTextStyle ..
4. removeRemoteInput reason: RemoteInputView$WindowInsetAnimation#onEnd entry: key, style: BigTextStyle ..
5. removeRemoteInput reason: RemoteInputView$WindowInsetAnimation#onEnd entry: key, style: BigTextStyle ..
6. removeRemoteInput reason: RemoteInputView#onDetachedFromWindow entry:key, style: BigTextStyle..

Bug: 290068526
Test: RemoteInputLogger addRemoteInput logs in BR
Change-Id: I863be99cb386d3b04a06b5445614225eee840610

Consider only the currently visible activities when looking for opaque
ones, for the sake of deciding which dim to use.

AnnotateActivity is a fullscreen opaque activity in the same task as ChooserActivity. As Annotate opened on top of Chooser, the task became opaque without waiting for Annotate to be visible, This was causing the dim to fade out too soon.

Fix: 281632483
Test: DimmerTests
Change-Id: Idc8c3192d68eee25d4221c92909deacdca85f6c3

Bug: 290869686
Test: Manual
Change-Id: Iad0991724c75c0a63d8a14c313a143a9be660137

Merge "Migrate MediaMetadataRetrieverTest to JUnit4" into main am: 7e44fa6c am: 7dd5e4df am: 7c9d7fbc am: cc7b9e65 am: 77d280d3

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



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