Update wallet/controls QS tile positions

For priority placement (users upgrading), slightly move the tiles down
to positions 3/4 from 2/3 (0-based index). For new users of controls,
make sure it appears on the first page of tiles.

Fixes: 190717521
Test: atest WalletControllerImplTest DeviceControlsImplTest
Change-Id: I6a273c38b267e5cdba79b2262f0870a6bc3e5eba
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImpl.kt
index 7563b30..3b272da8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImpl.kt
@@ -27,7 +27,6 @@
 import com.android.systemui.controls.dagger.ControlsComponent
 import com.android.systemui.controls.management.ControlsListingController
 import com.android.systemui.dagger.SysUISingleton
-import com.android.systemui.qs.QSTileHost.POSITION_AT_END
 import com.android.systemui.settings.UserContextProvider
 import com.android.systemui.statusbar.policy.DeviceControlsController.Callback
 import com.android.systemui.util.settings.SecureSettings
@@ -64,8 +63,8 @@
 
     companion object {
         private const val TAG = "DeviceControlsControllerImpl"
-        internal const val QS_PRIORITY_POSITION = 2
-        internal const val QS_DEFAULT_POSITION = POSITION_AT_END
+        internal const val QS_PRIORITY_POSITION = 3
+        internal const val QS_DEFAULT_POSITION = 7
 
         internal const val PREFS_CONTROLS_SEEDING_COMPLETED = "SeedingCompleted"
         internal const val PREFS_CONTROLS_FILE = "controls_prefs"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WalletControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WalletControllerImpl.kt
index af12844..143ba06 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WalletControllerImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WalletControllerImpl.kt
@@ -33,7 +33,7 @@
 
     companion object {
         private const val TAG = "WalletControllerImpl"
-        internal const val QS_PRIORITY_POSITION = 2
+        internal const val QS_PRIORITY_POSITION = 3
     }
 
     /**