Test: ConnectivityServiceTest Fixes: 184507247 Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f Merged-In: Ic4500dc85507fa68538c9ec179ec6eb4f44c5022 Change-Id: Ic4500dc85507fa68538c9ec179ec6eb4f44c5022 (cherry-picked from ag/14091168)
Test: ConnectivityServiceTest Fixes: 184507247 Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f Merged-In: Ic4500dc85507fa68538c9ec179ec6eb4f44c5022 Change-Id: Ic4500dc85507fa68538c9ec179ec6eb4f44c5022 (cherry-picked from ag/14091168)