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

Change-Id: I914c3ad6074e99e313c65572e3f38144a7f8a0d9