[automerger skipped] Merge changes from topic "lifecycle-udc-mainline" into udc-mainline-prod am: 9761b6b2 -s ours

am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 116c3337 is already in history

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



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

[automerger skipped] Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..." am: c1f15887 -s ours

am skip reason: Merged-In Ic6050d6ae6e720841ce2129880f1f7ed43328185 with SHA-1 116c3337 is already in history

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



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

[automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into udc-mainline-prod am: 5d0525f7 -s ours

am skip reason: Merged-In I5dc415ec6b59fe56c51844473a9cb2757eeb89c3 with SHA-1 9fab0122 is already in history

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



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

am skip reason: Merged-In I5dc415ec6b59fe56c51844473a9cb2757eeb89c3 with SHA-1 9fab0122 is already in history

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



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

Adds flicker test for the CUJ with entering pip with source rect hint.
This specifically tests with auto enter enabled, but we can probably
add a separate case for entering manually. The test uses a rectangle
as the source rect, and there is a jump at the end of the transition
as the app doesn't update the layout for pip, but this is more of an
app issue and doesn't affect the test case.

Flags: N/A
Bug: 284200208
Test: atest EnterPipWithSourceRectHintTest
Change-Id: I47ab50f19dc421dc0e0262c7b14f5b37dfb3551e

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



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

Merge "Platform version of Nearby's powered_off_finding flag" into main am: 8b91372f am: 946e750e

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



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

* changes:
  Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."
  Revert "Revert "Fix Expandable.kt to work with new Compose prebu..."
  Revert^2 "Lifecycle has to use kotlin syntax"

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



Change-Id: I72bb86884b0bd1861b194fd81c071fb0b61570de
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/+/2970214



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

Use aconfig to manage this flag and continue rollout.

Bug: 322143614
Bug: 283071711
Test: unit tests
Flag: ACONFIG com.systemui.trimResourcesWithBackgroundTrim DISABLED
Change-Id: Icf665eb60658aaea397d804c5465714065ef1fdd

Bug: 325314429
Flag: NONE
Test: atest SystemUITests
Test: Build, checked UI using two UMOs in the carousel.
Change-Id: I7ef387d184fce1970be26ec901f09e50d47c6ec6

* changes:
  Smooth out tap-to-expand notification
  Ensure burn-in doesn't impede insets

Test: atest com.android.settingslib.media
Bug: 291277292
Flag: NA
Change-Id: If82e99355ab689dfb2d5a95931bd057d84f3318e