Revert "Nuke SetupWizard"

* Alternate solution will be pursued

This reverts commit 7db9738f2e7fb07af22223f1062b5e7e30dc9121.

common/Android.mk

@@ -147,6 +147,18 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := SetupWizard
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/priv-app/SetupWizard/SetupWizard.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRIVILEGED_MODULE := true
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := com.google.android.maps
 LOCAL_MODULE_OWNER := gapps

common/common-vendor.mk

@@ -35,6 +35,7 @@ PRODUCT_PACKAGES += \
     GooglePartnerSetup \
     GoogleServicesFramework \
     Phonesky \
+    SetupWizard \
     com.google.android.maps \
     com.google.android.media.effects \
     com.google.widevine.software.drm

proprietary-files-common.txt

@@ -10,6 +10,7 @@
 -priv-app/GooglePartnerSetup/GooglePartnerSetup.apk:priv-app/GooglePartnerSetup/GooglePartnerSetup.apk:PRESIGNED
 -priv-app/GoogleServicesFramework/GoogleServicesFramework.apk:priv-app/GoogleServicesFramework/GoogleServicesFramework.apk:PRESIGNED
 -priv-app/Phonesky/Phonesky.apk:priv-app/Phonesky/Phonesky.apk:PRESIGNED
+-priv-app/SetupWizard/SetupWizard.apk:priv-app/SetupWizard/SetupWizard.apk:PRESIGNED
 
 -framework/com.google.android.maps.jar:PRESIGNED
 -framework/com.google.android.media.effects.jar:PRESIGNED