Merge changes Ia239ec9b,I7eaf5cda into main

* changes:
  Ignore keyguard transitions FROM an invalid state.
  Add currentTransitionInfo + filterRelevantKeyguardState.