[automerger skipped] Fix and deflake ConnectivityManagerTest am: 8c91b0feaf -s ours

am skip reason: Change-Id I7459753b1068e1760a95337760db58d1df213fad with SHA-1 2f5879f6c7 is in history

Change-Id: I5ed932453d08d05eed232c6303ef0cae2c703610
tree: ee92ad13546b31537b7537583fa45e8cadf69128
  1. tests/