Merge "Set lock screen to be in public mode if one of its profile is secure" into nyc-dev
am: 95a127c

* commit '95a127cbf49f8fb6496e4b81b2f0d716d7f8cfbc':
  Set lock screen to be in public mode if one of its profile is secure

Change-Id: Ifc69a8d24615a93ad1e3c8519a38ca5e79ee276e