* changes:
  Revert "Revert "NSSL Migration - Animate top padding on shade pu..."
  Revert^2 "Burn in - Don't allow it to enter top inset"

[automerger skipped] Merge "Consume pending display config change with multiple remote callbacks" into udc-qpr-dev am: 33285cfb -s ours am: ba974e57 -s ours

am skip reason: Merged-In I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf with SHA-1 d45c6434 is already in history

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



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

[automerger skipped] Consume pending display config change with multiple remote callbacks am: c793afe3 -s ours am: 65170833 -s ours

am skip reason: Merged-In I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf with SHA-1 d45c6434 is already in history

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



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

* changes:
  [Tether] Release flags related to Instant Tether
  [Internet tile] Add accessibility class name to InternetTileNewImpl

[automerger skipped] Merge "Consume pending display config change with multiple remote callbacks" into udc-qpr-dev am: 33285cfb -s ours

am skip reason: Merged-In I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf with SHA-1 d45c6434 is already in history

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



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

[automerger skipped] Consume pending display config change with multiple remote callbacks am: c793afe3 -s ours

am skip reason: Merged-In I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf with SHA-1 d45c6434 is already in history

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



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

[automerger skipped] Merge "Removing non SYSTEM user before running systemUserOnlyTest" into udc-dev-plus-aosp am: aeadff89 am: 25797f83 -s ours

am skip reason: Merged-In I6f536b7f5b85e4e884bd284b1848e43ac3c9029d with SHA-1 b1bba3e9 is already in history

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



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

Flag: NONE
Bug: b/308177279
Test: Manual. Turn DND on. Open Volume Dialog. Observe that the media
icon has changed to DND.

Change-Id: I023e232cc19ec1f3a49b3543f805fe5cd75102dd

Merge "Remove temporary `FlickerTestsAppLaunch` now that test configurations have been updated" into main

Merge "Removing non SYSTEM user before running systemUserOnlyTest" into udc-dev-plus-aosp am: aeadff89

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



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

* changes:
  Format code according to linter rules after moving it into different packages
  Split wm shell flicker tests into completely independent folders, which can be transferred to the respective teams.

Bug: 245950570
Test: Manual
Change-Id: I5c1bd369e63826d0ab264277fe735c0c051abcbf

[automerger skipped] Merge "Cherry-pick MediaFrameworkTest dep changes from internal main" into aosp-main-future am: aae44639 -s ours am: f78e26ed -s ours

am skip reason: Merged-In I8cb92fd35b3633cf458f8692173124fd1666d6b5 with SHA-1 54342761 is already in history

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



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

[automerger skipped] Cherry-pick MediaFrameworkTest dep changes from internal main am: 8637fb88 -s ours am: 3de5174c -s ours

am skip reason: Merged-In I8cb92fd35b3633cf458f8692173124fd1666d6b5 with SHA-1 54342761 is already in history

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



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