d2att: no need to inherit props twice

Change-Id: Ic8013e17ff7a342cce6bc8f4479db2219223a467
d2att: do not set preferred apn settings

We have canadian galaxy s III who are using the same build

Change-Id: I1340d823f389de7b565fa9b9518d123c744ccd22
Merge remote-tracking branch 'cm/cm-10.1' into HEAD