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

Change-Id: I78ab5bbe68ada65f8691cda55fc6b1db0f708aac