Fixes: 184028345 Test: ConnectivityServiceTest Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f Merged-In: Ib5cd2c27a2bd0f53b500e8edbe48126fbf58f34d Change-Id: Ib5cd2c27a2bd0f53b500e8edbe48126fbf58f34d (cherry-picked from ag/14034625)
Fixes: 184028345 Test: ConnectivityServiceTest Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f Merged-In: Ib5cd2c27a2bd0f53b500e8edbe48126fbf58f34d Change-Id: Ib5cd2c27a2bd0f53b500e8edbe48126fbf58f34d (cherry-picked from ag/14034625)