Merge "Fix ConnectivityManagerApi23Test failures and remove duplication." into qt-dev am: ea66bf6632
am: 2d99b49651

Change-Id: I0c02357eff07b98c1745de35d08ae6b8349de7fb