Adding more checks around unlocking the phone

Bug: 151613234
Change-Id: I045306cce2ce85d6895c9f050ebb4d2bd15ba232
1 file changed