Bug: 314887263
Test: manual
Change-Id: I3d57b61fdfd7869bcc36fa2a953ac8630369d394

Merge "Check only the display where the app layer is supposed to be, not all visible displays" into main

Fixes: 321148772
Test: atest ChangeAppRotationTest
Change-Id: I0e05d32237c9266641bbc3be49caeafa0b0f9da0

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 2d3fbfd0 -s ours

am skip reason: contains skip directive

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



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

am skip reason: contains skip directive

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



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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 81605b75 -s ours

am skip reason: contains skip directive

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



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

am skip reason: contains skip directive

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



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

The androidx.navigation:navigation-compose:2.7.5 contains a behavior
change, which cause the BrowseActivity to have a wrong animation when
starts.

Also updates the lib versions.

Fix: 312337620
Test: manual - with Gallery
Test: manual - with Settings
Change-Id: Ie8bb849cc21ebd4f01a19e534d3078077514cbbb

Revert submission 25874661-remove_grp_expansion_flag

Reason for revert: Broken Build 11322568 on git_main on aosp_cheetah-next-userdebug

Reverted changes: /q/submissionid:25874661-remove_grp_expansion_flag

Change-Id: Ib5135c756b47e5301a9d8141c02382e2d20776c0

[automerger skipped] Merge "Make the android-test-mock-current.txt available for use by the /vendor tests" into main am: 4e49a6c2 am: dd722862 -s ours

am skip reason: Merged-In I228744137f82e14bec936b11b96cb6876a392487 with SHA-1 2701ba6b is already in history

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



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

Merge "Make the android-test-mock-current.txt available for use by the /vendor tests" into main am: 4e49a6c2

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



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

In the previous change we added settings observer on the main user to
listen to autolock preference changes. However, auto-devices do not have
main user and hence getMainUser() will return null. This can cause
failures while registering for the settings observer. This changes fixes
this issue by adding null checks before registering the observer.

Test: Tested manually
Bug: 321084663
Change-Id: I29e9c5a03fbf9c6587db7a6f132f7f70204dc012

Merge "[V][CDM] Replace transport listener and message listener with functional interfaces" into main

[automerger skipped] Merge "order dependendencies in AconfigFlags.bp" into main am: 9851516d am: 50c3885d -s ours

am skip reason: Merged-In I005714dcf7be28d64e9d131b46d86c857ee4231d with SHA-1 d252f291 is already in history

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



Change-Id: I7307e1f8f0ce0e8f7684d525cd20d25ae7e6a964
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/+/2907821



Change-Id: Iddebc496acae620dd630e40eabf9b1a731f0a4ee
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/+/2914974



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

Added more unit tests for radio metadata, band descriptor and config,
and program selector to improve broadcast radio system API test
coverage.

Bug: 282031772
Test: atest BroadcastRadioTests
Change-Id: I6095f5e828270af753508406cf5e1a166b42bceb

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



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

NotificationIconContainer#setAnimationsEnabled can apply a stale cached
icon color to its child StatusBarIconViews, causing incorrectly colored
notification icons in the status bar.

This specific color application is only relevent to the
NotificationShelf; a check is added such that it will not be invoked
for the status bar or AOD icons.

Flag: ACONFIG com.android.systemui.notifications_icon_container_refactor STAGING
Test: atest SystemUITests
Bug: 318460865
Change-Id: I8d4e6777f45bfe2a8f14a1061d86aebb96db15b8

This reverts commit b0ed625c.

Reason for revert: Not culprit for b/25925437

Change-Id: Ibd95037e0b0f795b1c56aa0e71d644921ae16f79