Merge "Update isValidLockdownProfile to block PPTP" into nyc-mr1-dev