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

Change-Id: I5879bb1866af9714dfa1f9ca4e7adfb7ba19f21c