Bug: 185149952 Test: atest ConnectivityManagerTest Change-Id: Ie9391d9332ded58cf1e63c8c5c6f5ba85c950bc6