Revert "Fix missing grouping after shade closes"

This reverts commit ead153f8c699cbfb0bddb85f6482aa984b366201.

Reason for revert: DroidMonitor: Reverting by following go/jank-rotation-playbook .

BugID: b/368568210

Change-Id: I2c017d0666f65ad7ac4681b83d191288b40bd942
5 files changed