Merge changes I2536ae30,Ieaef83a2 into udc-qpr-dev

* changes:
  Do not run face auth if keyguard is already authenticated with face.
  Do not make device is asleep a gating condition for face auth