Pseudo-merge scene_container and keyguard_wm_state_refactor.

scene_container depends on keyguard_wm_state_refactor, but keyguard_wm_state_refactor does not need scene_container (ouch).

We would like to continue attempting to roll out keyguard_wm_state_refactor independently of scene_container, in case that flag is further delayed, but we also don't want to end up in a situation where scene_container is in STAGING without keyguard_wm_state_refactor. This is the simplest way to make that possible.

Bug: 278086361
Test: enable scene_container, keyguard_wm_state_refactor, both, neither
Flag: com.android.systemui.keyguard_wm_state_refactor
Change-Id: I200c946965676fcf403f8b69b6dc392164955fd5