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

Change-Id: Ib7e586a778c6fb9b920f0790e4b343c122250bb7
tree: f2272c7dd0cc9873d9467ba6d6778694f413aff2
  1. core/
  2. services/
  3. tests/