Make SetupWizard override Provision again

arm/Android.bp

@@ -66,6 +66,7 @@ android_app_import {
 	name: "SetupWizard",
 	owner: "gapps",
 	apk: "proprietary/product/priv-app/SetupWizard/SetupWizard.apk",
+	overrides: ["Provision"],
 	presigned: true,
 	dex_preopt: {
 		enabled: false,

arm64/Android.bp

@@ -66,6 +66,7 @@ android_app_import {
 	name: "SetupWizard",
 	owner: "gapps",
 	apk: "proprietary/product/priv-app/SetupWizard/SetupWizard.apk",
+	overrides: ["Provision"],
 	presigned: true,
 	dex_preopt: {
 		enabled: false,

setup-makefiles.sh

@@ -75,7 +75,7 @@ printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)"
 sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
 
 # Make Google SuW override Provision
-sed -i 's/\(SetupWizardPrebuilt.apk",\)/\1\n\toverrides: ["Provision"],/' "$ANDROIDBP"
+sed -i 's/\(SetupWizard.apk",\)/\1\n\toverrides: ["Provision"],/' "$ANDROIDBP"
 
 # We are done with target
 write_footers

x86/Android.bp

@@ -33,6 +33,7 @@ android_app_import {
 	name: "SetupWizard",
 	owner: "gapps",
 	apk: "proprietary/product/priv-app/SetupWizard/SetupWizard.apk",
+	overrides: ["Provision"],
 	presigned: true,
 	dex_preopt: {
 		enabled: false,