apns: cleanup 3 ITA carrier

Change-Id: I14eb1e68943bdf9b0164afa1dd4258e55d709334
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge branch 'cm-10.2' into cm-10.2-defy