Merge "Change to not cache user entered apn type as user may change it." am:...
Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa0 am: b2498bc4 am: f70f5347
am: 4bb56f52
Change-Id: I1862129b9ec0e2c20981586cf29c672f30c2912f