Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev