Merge "KeyguardClockPositionAlgorithm Test updates" into sc-dev