Merge changes I07be68ab,I5087008a into main

* changes:
  Consolidate finishedKeyguardStep and make it a StateFlow
  Consolidate startedKeyguardTransitionStep and make it a StateFlow