Merge "Revert "ConnectivityServiceTest: more informative assert failures"" am: d10790c902
am: 8f68232271

Change-Id: I575095f54431145106c626437d7187f50e445510