am e0c0e93a: am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev

* commit 'e0c0e93a0f4582fca58733be7a4b1d7a6e6e8029':
  Fixed wake to unlock when the device has never been unlocked