Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am: 1a69570fe8
am: 3b92631a69

Change-Id: I82c297e654af6690c6a3be216a0da08a3aff5b9d