Merge "ConnectivityServiceTest: fix flakyness" am: a82cac1452 am: 004f36d5bc am: eb9d0f16aa
am: 4076528b69

Change-Id: I4225fabd1b9af92a7c688e2cfbab3b20e58c53dd