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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15682590

Change-Id: I678f82f0f9f6afd63c51e8a7cfa700ac10caef75