Merge "Get APM state from ACTION_AIRPLANE_MODE_CHANGED intent instead"