Merge "Merge "Fix ConnectivityManagerApi23Test failures and remove duplication." into qt-dev am: ea66bf6632 am: ac495ca119" into qt-r1-dev-plus-aosp
am: 2e97f51387
Change-Id: Iecac6ad4a66983a783936da6f92d58a5cddf3dd8
This commit is contained in: