Merge "ConnectivityServiceTest: more informative assert failures" am: 04d8a730a9 am: 0a7f5cc9d6 am: 14f400ca81
am: 89c67d3211

Change-Id: Icafd27e8273aa6b6595c30affd23a960e5d55c53