Merge \"Update isValidLockdownProfile to block PPTP\" into nyc-mr1-dev
am: da68f0614c

Change-Id: Ie2d433c537fc27cbe04f80cd74c464e4a216238e