Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN"