Merge "Merge "Move VPN restriction check into setup dialog" into nyc-dev am: 32ceb9c801 am: 8d27936438" into nyc-mr1-dev-plus-aosp
am: 5af6e7d4b5

* commit '5af6e7d4b5301690c3cd9df7a713fd905270c7b1':
  Move VPN restriction check into setup dialog

Change-Id: I300b7bd3493106df90086ed88922b9806041da66