The goal of this is to simplify ConnectivityService by reducing the amount of code it contains. This is small enough to be obviously correct and followup changes will move code into this class. Test: runtest Change-Id: Ic5ab19b521e98ae397c9bf657856820304362fbb