[automerger skipped] Merge "Split applyNewState into enable/disable APN" am: 56401a4c74 am: c2468ed1e3
am: 40951923b3 -s ours
am skip reason: change_id I51fd01d798cdf8d04fd41455126d017ac97f5f3f with SHA1 ade6d1a66d is in history

Change-Id: I8cabd4454db276f6806c7f2f21ffd127ee7d1e03