Merge "Revert^2 "Disable keyguard_wm_state_refactor for test that sets keyguardGoingAway."" into main