Merge "Merge "Set lock screen to be in public mode if one of its profile is...
Merge "Merge "Set lock screen to be in public mode if one of its profile is secure" into nyc-dev am: 95a127cb am: b4c3c1fc" into nyc-mr1-dev-plus-aosp
am: 69e299d9
* commit '69e299d9':
Change-Id: Iddd7da13cdbd1259c3a74d80b9c8e0629b2da123