Reland fixing clock staying in AOD state in LS when transitioning from bouncer and camera

Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint STAGING
Bug: 330187403
Test: manual, atest ClockEventControllerTest

Change-Id: I93dd5ab34ff3f596388770c287794628c49ad598
2 files changed