Merge changes I9983f370,I6e962ff0 into main

* changes:
  Update the face auth locked out state only if face auth is enrolled,
  Fixes the issue of UDFPS icon background being white when the device is in DOZE_PULSING state