Merge "Move cleaning up previous clock and assigning clock for clockEventController to KeyguardClockRepository when currentClock changes" into main