Merge "Revert "Fix clock staying in AOD state in LS when transitioning from bouncer and camera"" into main