Merge "Fix and deflake ConnectivityManagerTest" am: 591263914c

Change-Id: I8caf45c73d7fb9a44251d0403734c675064e0335
tree: 7f2742de058d8d87f362b8f349d227d868e7f999
  1. tests/