Merge "Settings: fix apn_editor carrier_enabled summaryOff string"