Move SetupWizard to system_ext

* This is where it's supposed to be

x86/Android.bp

@@ -29,19 +29,6 @@ android_app_import {
 	product_specific: true,
 }
 
-android_app_import {
-	name: "SetupWizard",
-	owner: "gapps",
-	apk: "proprietary/product/priv-app/SetupWizard/SetupWizard.apk",
-	overrides: ["Provision"],
-	presigned: true,
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	product_specific: true,
-}
-
 android_app_import {
 	name: "Velvet",
 	owner: "gapps",
@@ -54,3 +41,16 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "SetupWizard",
+	owner: "gapps",
+	apk: "proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk",
+	overrides: ["Provision"],
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	system_ext_specific: true,
+}
+

x86/x86-vendor.mk

@@ -15,8 +15,8 @@ PRODUCT_PACKAGES += \
 ifeq ($(TARGET_IS_GROUPER),)
 
 PRODUCT_PACKAGES += \
-    SetupWizard \
-    Velvet
+    Velvet \
+    SetupWizard
 endif
 
 $(call inherit-product, vendor/gapps/common/common-vendor.mk)