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

Change-Id: I21a69eb02b13b20f66996836d54b8aadadfa80ec
tree: 2c155f5bebd32efe6fc4e523cf29084368bc7c34
  1. core/
  2. services/
  3. tests/