Revert^2 "Allow vendor_init to set setupwizard prop" dd5d44c6f6570e9b21709444751e795662f1dcb0 Change-Id: Id32f5409e88e377f96c0e774a13bbb2cec246bfa Merged-In: I7a46078fb68b61b608296c1a1c509dd5cedfd1e2