Bug: 171872461 Test: atest ConnectivityManagerTest Change-Id: I43dfb049c271602526fa3e89ebb91219c7785a21