Merge "Split applyNewState into enable/disable APN" am: 56401a4c74
am: c2468ed1e3

Change-Id: Ic458340d04bcbc4b8a68854ebd10ed7a4cf065ce