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

Change-Id: I4f5002b1b6849fe4fdb54a98007f718841901063