Revert "Fix cdma data calls based on NV"

Causing a wild issue on d2vzw and jfltevzw.
If you connect to wifi, data will be broken when you disconnect
unless you reboot the phone.  Reverting this and the dependant
base change fixes the issue with data coming off wifi.

This reverts commit 7cd6a99e.

PS2: Retain some NV pieces
PS3: Fix compile
PS4: derp

Change-Id: Iaad556f46bf5d35483f1c44c054945511d8c4234