Return to OCCLUDED from canceled swipe if needed.

An edge case of a canceled screen off, followed by a partial swipe up to PRIMARY_BOUNCER, followed by a slightly late call to setOccluded=true resulted in the lockscreen overlapping the occluding app until a screen off.

Tests in a follow-up CL (really!) because there are no existing tests for the dragging transition and it's a fairly large change to add support for that.

Bug: 370177430
Test: manual/shortly
Flag: EXEMPT bugfix
Change-Id: I6af8b473756e43ebccecbccdd6c97d8d082ef912