Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am: 63ca8979e4 am: b4b83c82cd
am: 65373db594

Change-Id: I5e0faee7a0b1c6bdfafe77560a91e999f40edc4a
tree: 68284ccefc5097a4e95d95c950d999f761e2f87a
  1. core/
  2. services/
  3. tests/