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

Change-Id: Id038c0f03a0edaff27b51878a6e2ee7aace7e7cb