[flexiglass] Don't switch to Shade when collapsing shades

Fix: 404946372
Test: unit tests added
Test: manually verified that unlocking doesn't expand the shade anymore
Flag: com.android.systemui.scene_container
Change-Id: I76e3443fc3df2c77435bdddc64168b972fba266a