Merge "Settings: fix apn_editor carrier_enabled summaryOff string" am: 9d29833485 am: 6ee2108bdb
am: 980d003f40

Change-Id: I484d34231ff23a25e41010c2deffdb46bf539ec5