Merge "Move VPN restriction check into setup dialog" into nyc-dev
am: 32ceb9c801

* commit '32ceb9c801a86f901ec8230eec301c30e1deff3b':
  Move VPN restriction check into setup dialog

Change-Id: Ifa6978abafaebf97cd43d37e65572e3fca903c46