Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am: 1a69570f am: 3b92631a am: 10957727 Change-Id: I5e0faee7a0b1c6bdfafe77560a91e999f40edc4a