Merge \"Do not show user locked notification after reboot when there is no lock\" into nyc-mr1-dev
am: f32e96a8df

Change-Id: If32cda85b7737d04ffc83fc6686c176f9e6910a1