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

Change-Id: Ieca6c0f30e69a0a122553b95510d4957d1da7182