Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev