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

Change-Id: I07976d8ba15a94c71359c4723c64d9d9374ec2ba