Do not report AOD as showing when fading away

AOD will still be showing when we authenticate from AOD2, but WM
cannot show the activity untill we leave the AOD state, this causes
transition jank.

I'm now consolidating the dozing state with wakeAndUnlock
to account for AOD2 wake-ups.

Test: wake-up from LS to app
Test: wake-up from LS to home
Test: wake-up from AOD2 to app
Test: wake-up from AOD2 to home
Test: open app, wait for screen timeout
Test: look at logs on #updateActivityLockScreenState
Bug: 134952761
Fixes: 136737610
Change-Id: I08d087eb78788ca89d8f4a4ae67bbc597bcb650b