Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev am: d1c3bb1341
am: 3d8d9808dd
Change-Id: I50dd513140c05aeee04552f009ea010b84f8dade
This commit is contained in: