Fix GONE->AOD->GONE with timeout

In this case, the transitions were incorrectly going to LOCKSCREEN
when it needs to go to GONE. Fix this by combining all wake flows
from AOD in order to make the decision one time.

Fixes: 336800288
Test: atest FromAodTransitionInteractorTest
Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint
TEAMFOOD

Change-Id: I527ac171906188545ddf083b26d2a15b61c0b892