Merge changes Idd1f2b2b,I6a46bb2f,Ibdf7c175

* changes:
  Move the animation delay for credential UI up one layer
  Animate height animator together with the rest of the AnimatorSet
  Temporarily do not remove biometric view when animating to credential