Merge "Remove SystemClock.uptimeMillisClock()."