Merge \\"Don\\'t show always-on option connecting PPTP vpn\\" into nyc-mr1-dev am: 1926ed9f83
am: 2ac7bc0565

Change-Id: I5945bb58dc952bc149a03325013f0904d5157847