Merge "ConnectivityServiceTest: fix flakyness"
am: a82cac1452

Change-Id: I241192b2d9565c41f47bbe6227b50049898da679