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

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