am b056d71f: If setupwizard is disabled, don\'t force it to optional
am b056d71f: If setupwizard is disabled, don\'t force it to optional

* commit 'b056d71f79b717fb36d375e48c19509900f977d3':
  If setupwizard is disabled, don't force it to optional

xorware/android_build,xorware/android_build,knone1/platform_manifest,fallouttester/platform_manifest,ND-3500/platform_manifest,xorware/android_build,RR-msm7x30/platform_manifest,pranav01/platform_manifest,hagar006/platform_manifest,see4ri/lolili,xorware/android_build,Hybrid-Power/startsync,xorware/android_build