Listen for additional AOD->* transitions

AOD->OCCLUDED logic was not quite right, as it waited for the doze
machine finish. In some cases, the transition to AOD is interrupted,
such as when hitting the power button while unlocked and receiving a
phone call.

AOD->PRIMARY_BOUNCER was never mapped. This does happen when the user
is locked out of biometrics, but attempts to use it anyways.

Fixes: 317464126
Test: atest KeyguardTransitionScenariosTest
Flag: N/A
Change-Id: Iec50306252941a90c822a1b27dfef70a9857b1d1