Merge "Set CarrierTextManager.airplaneMode to true when wifi enabled while in airplane mode" into udc-dev