Merge "Fix and deflake ConnectivityManagerTest"
tree: 7f2742de058d8d87f362b8f349d227d868e7f999
  1. tests/