Merge "Fix and deflake ConnectivityManagerTest" am: 591263914c am: 1d4d950451

Change-Id: I0b1dd2ad17b3c6460187d7e029ad787a7ba57824
tree: b54089423911633f879e49d0a731e9b7623f8825
  1. tests/