Merge "Don't show always-on option connecting PPTP vpn" into nyc-mr1-dev