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

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

Change-Id: I77fc206f186ca417a86a9d95c56b13b3d9f83187