Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa052 am: b2498bc422
am: f70f53473a

Change-Id: Id3fd20f5156e233b4e0fe41c6a30f89f08b038db