Merge "Change to not cache user entered apn type as user may change it." am: 54eeafa052
am: b2498bc422
am: f70f53473a
am: 4bb56f5282
Change-Id: I1862129b9ec0e2c20981586cf29c672f30c2912f
This commit is contained in: