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

Change-Id: Ib7e586a778c6fb9b920f0790e4b343c122250bb7