Bug: 79748782 Test: ConnectivityServiceTests still pass Change-Id: Ic8231b18a17e6feb5ebafe8d5688fb59f9d4d58e