Merge "Cleaning up KeyguardClockPositionAlgorithm and its tests" into sc-v2-dev