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
am: 6afddc23
Change-Id: I8ca45f06f6c37a7deadf4dbc91f0e4bc06ba04c9