Merge "Restart wificond when zygote died" am: 7e6c19e8b8
am: 63c3065bdc

Change-Id: I547f5fbfcf1560785a83bef56282c7ee2cbf855c