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

This reverts commit f09f2f66dccbafea9e5fa5204b443d19181a78e0.