Recreating the UMO causes a visual flicker. Since the
theme can be changed from a quick setting, this flicker
may occur while it is onscreen. The UMO now uses it's
own colors and does not need to be recreated for theme
changes.

Test: Manual
Fixes: 232295658
Fixes: 204414378
Change-Id: Ifcdb95e7b783cfe8634c8280ac1aa13f193e04bd

[automerger skipped] Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378 am: 1f68b323 am: 59378118 am: 6b1bf26b am: 2eb95344 -s ours

am skip reason: Merged-In I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc with SHA-1 520cc2fd is already in history

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



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

* changes:
  Add SettingsJankMonitor
  Add SETTINGS_TOGGLE CUJ to InteractionJankMonitor

Bug: 233282171
Test: atest SystemUITests
Change-Id: I3a9928d940213d140986bba4749423866e9fdb3d

- If carrier Wi-Fi is active then use carrier Wi-Fi level instead of
  mobile data level.

- If carrier Wi-Fi level is less than min-level, use min-level instead.

Bug: 222885558
Test: manual test
atest -c InternetDialogControllerTest

Change-Id: If8d2871e61396dd8eb3ebab5eda0906d46a06c33

 - In some rare cases, EnhancedEstimates will not provide isHybird as true(means EnhancedEstimates can not provide data to us), it will makes low battery warning logic back to the previous trigger flow, remove isHybird condition to make sure we always use the new trigger condition.
 - Although BatteryStateSnapshot will be created by different EnhancedEstimates data, but we already remove the usage of remaining time as our trigger condition(which provided by EnhancedEstimates) so we are safe to always use new trigger condition with or without EnhancedEstimates data. we should think about refactor the class here in the future.
 - Use current battery level as notifications string content instead of a fixed value.

Bug: 232663250
Bug: 232686016
Bug: 232712770
Test: atest SystemUITests
Change-Id: I412be50763db39d364757ae3afc2927467451118

Bug: 233283726
Test: atest, verified ignored
Change-Id: I82162880c0c63cee02ddb45dcde49f601adf65a1

Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378 am: 1f68b323 am: 59378118 am: 6b1bf26b

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



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

Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378 am: 1f68b323 am: 59378118

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



Change-Id: I831ae41f1de1dd8cd8c150f266b8ec07f57413e7
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/+/18279994



Change-Id: I8ad5f88e34f6d3838bf63f0350af8fe333db850f
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/+/18279994



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

This reverts commit fb4a590d.

This change brings back the grace period built in VCN because
the carrier privileges grace period is turn off.

Bug: 229418673
Test: atest FrameworksVcnTests CtsVcnTestCases
Change-Id: I85738c969c2bf78da33beaebe5863432948b7735

Bug: 233256741
Test: atest tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java
Test: atest ./services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java
Test: atest ./services/tests/servicestests/src/com/android/server/usage/AppIdleHistoryTests.java

Change-Id: I9850f160498d5e8a4d0dfa45307fcde9851635f8