Restore clock doze transition

I had recently updated the doze path to listen to any change
to/from AOD. This works for other code, but not clocks. Put
the prior code back.

(Apologies, ktfmt changed way more code than I did)

Fixes: 327910913
Test: atest ClockEventControllerTest
Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint
TEAMFOOD

Change-Id: I7315f545a75def7a727b8ecd16824f04e0d6ac31
2 files changed