Forcing closing QS when going from SHADE_LOCKED to KEYGUARD

This is follow-up to ag/20411848 which fixed scrims showing up when going from expanded shade to keyguard with power double press.
The original CL missed the case of going to keyguard from SHADE_LOCKED state, so it's added here.

Fixes: 251025114
Test: NotificationPanelViewControllerTest
Change-Id: I95283f64bc43f2dc45a58cb4ff4b9fff5ffd1799