Merge changes I80a85e7e,I74d30d83 into main

* changes:
  Don't remove the UdfpsView if it hasn't been added yet.
  Use KeyguardTransitions instead of PowerInteractor's wakefulness state