Clean up APNs for au and SoftBank (Japan)

Change-Id: I67223792af2abee5c9372cbe47745dbfa6b525a6
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0