Merge "Fix and deflake ConnectivityManagerTest" am: 591263914c

Change-Id: I8caf45c73d7fb9a44251d0403734c675064e0335