Merge \"Fix always-on is not turned off when user forgets vpn\" into nyc-mr1-dev
am: 9505b78e29

Change-Id: I60148caf5e9bd37ae2c0460e6c8a8d6aacf478aa