Merge cherrypicks of ['googleplex-android-review.googlesource.com/27829737'] into 24Q2-release.

Change-Id: I02edc8a40ae34d0f73f50899ced53aa663f5d172
diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/QuickSettingsKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/QuickSettingsKosmos.kt
index 89bb16c..4e87bee 100644
--- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/QuickSettingsKosmos.kt
+++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/QuickSettingsKosmos.kt
@@ -27,53 +27,5 @@
 val Kosmos.qsEventLogger: QsEventLoggerFake by
     Kosmos.Fixture { QsEventLoggerFake(uiEventLoggerFake, instanceIdSequenceFake) }
 
-var Kosmos.qsTileFactory by Fixture<QSFactory>()
-
-val Kosmos.fgsManagerController by Fixture { FakeFgsManagerController() }
-
-val Kosmos.footerActionsController by Fixture {
-    FooterActionsController(
-        fgsManagerController = fgsManagerController,
-    )
-}
-
-val Kosmos.qsSecurityFooterUtils by Fixture {
-    QSSecurityFooterUtils(
-        applicationContext,
-        devicePolicyManager,
-        userTracker,
-        fakeExecutorHandler,
-        activityStarter,
-        securityController,
-        looper,
-        dialogTransitionAnimator,
-    )
-}
-
-val Kosmos.footerActionsInteractor by Fixture {
-    FooterActionsInteractorImpl(
-        activityStarter = activityStarter,
-        metricsLogger = metricsLogger,
-        uiEventLogger = uiEventLogger,
-        deviceProvisionedController = deviceProvisionedController,
-        qsSecurityFooterUtils = qsSecurityFooterUtils,
-        fgsManagerController = fgsManagerController,
-        userSwitcherInteractor = userSwitcherInteractor,
-        securityRepository = securityRepository,
-        foregroundServicesRepository = foregroundServicesRepository,
-        userSwitcherRepository = userSwitcherRepository,
-        broadcastDispatcher = broadcastDispatcher,
-        bgDispatcher = testDispatcher,
-    )
-}
-
-val Kosmos.footerActionsViewModelFactory by Fixture {
-    FooterActionsViewModel.Factory(
-        context = applicationContext,
-        falsingManager = falsingManager,
-        footerActionsInteractor = footerActionsInteractor,
-        globalActionsDialogLiteProvider = { mock() },
-        activityStarter,
-        showPowerButton = true,
-    )
-}
+var Kosmos.newQSTileFactory by Kosmos.Fixture<NewQSTileFactory>()
+var Kosmos.qsTileFactory by Kosmos.Fixture<QSFactory>()
\ No newline at end of file