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

Change-Id: I21a69eb02b13b20f66996836d54b8aadadfa80ec