Merge "Don't crash ConnectivityService if the network stack crashes."
am: 55d1b0500a

Change-Id: I1ee83023ad0cf12c980daf730926fadd82699c3b