Merge "Ringtone picker to handle RESULT_CANCELED from Add ringtone" into main am: 3bd28b58 am: ca6f28e8

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



Change-Id: I4fb09f269376af348b2798dce42d06d3b6e07f49
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/+/1537217



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

[automerger skipped] Merge "Add register_nsd_offload_engine to flags.aconfig" into main am: efffa949 am: 1114254f -s ours

am skip reason: Merged-In Id4d4b29f86e80aae170df49c668c4fd3ade4863d with SHA-1 158cdccf is already in history

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



Change-Id: I51c16db6643bdd39d65b031e5ab2b1e067b7aa0e
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/+/2967143



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

Bug: 326143814
Test: Local integration with Omnient, atest
Change-Id: I75ea7a47a5733eafa5843f14a25d014f3c7a1ae1

Merge "Revert^2 "Enable default background network restrictions"" into main am: a77be890 am: 7b8042a3

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



Change-Id: I8fcc6e4e2fa1662b04a6d593006bf96446cc0827
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/+/2971712



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

This reverts commit 89848002.

Reason for revert: Test revert b/327296571

Change-Id: I9c0dd0c333cb4b3f67d27aa78cd0d02d61af79b7

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



Change-Id: I21b3fdfd88bd168fd5a8a22b9f3d11fabaef09cf
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/+/2971712



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

* changes:
  [flexiglass] Changes shade and QS background color.
  [flexiglass] Fixes "wallpaper not visible on AOD" bug.

Which for verifying displayPreference not call, but actually called it
in test, does not make sense.

Bug: 324862928
Test: atest WifiMacAddressPreferenceControllerTest
Change-Id: I04a47de75cc8ceeb12cad3d79c28e350b6b391fd

Merge "Revert "Demote VolumeDialogImplTest#dialogDestroy_removesPostureControllerCallback"" into main