Adjust CDMA devices except VZW (go back to PA official build.)  Requires manually removing apns-conf.xml copy from build before building by doing this though.

Change-Id: Ia8ca790fadc5427f3fc00852626644e97f2da09c