Revert "Network Settings: move APN to common area, both CDMA and GSM use this"

This reverts commit e7fe93c386a5fb94bf5cde9b1304dcda020751be.
CDMA Options: we want APN settings too

Change-Id: Ia5f04a604b3e7945cad3914a2888b3e7c1a34626