SetupWizard: Conditionally run account setup

If the package defined by cm_account_type (which can be overlayed)
exists, then add CyanogenSettingsPage. Otherwise, omit.

PS3: On the cyngn side, the account type and package name don't match. Added a new string to overlay.

Change-Id: I15e032e21281aaf51ca32ac9cc0861e033201f19

src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java

@@ -26,6 +26,7 @@ import android.telephony.TelephonyManager;
 
 import android.util.Log;
 import com.android.internal.telephony.TelephonyIntents;
+import com.cyanogenmod.setupwizard.R;
 import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
 
 import java.util.ArrayList;
@@ -66,7 +67,9 @@ public class CMSetupWizardData extends AbstractSetupData {
         if (SetupWizardUtils.hasGMS(mContext)) {
             pages.add(new GmsAccountPage(mContext, this).setHidden(true));
         }
-        if (!SetupWizardUtils.hasLeanback(mContext)) {
+        if (!SetupWizardUtils.hasLeanback(mContext) &&
+                SetupWizardUtils.isPackageInstalled(mContext,
+                    mContext.getString(R.string.cm_account_package_name))) {
             pages.add(new CyanogenServicesPage(mContext, this).setHidden(true));
         }
         if (SetupWizardUtils.hasFingerprint(mContext) && SetupWizardUtils.isOwner()) {