Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am: 35af406240
am: 19aa93e742

Change-Id: I82c297e654af6690c6a3be216a0da08a3aff5b9d
tree: 43f8e5b355f1ca932fc0a2287eba65828a465f2a
  1. core/
  2. services/
  3. tests/