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

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

Change-Id: Iba17b0ade4e0ad775a430ac6d0de2c55ea4d4acc