apns: cleanup 3 ITA carrier

Change-Id: I14eb1e68943bdf9b0164afa1dd4258e55d709334
merge changes from CyanogenMod 10.2 into local branch
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2