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

Change-Id: I17061da1b2857b9339878cd4ca027425652bcb5a