Test: atest ConnectivityManagerTest Fix: 183553812 Change-Id: I60801bb86302b57f6d72ea903d98a8249fae4555