Merge "Implement ConnectivityService TODO and fix many race conditions"
am: f6b72dd145

Change-Id: I2011e23c9f894c079ab66cd7cc5c14af572a956d