Merge "Add a wrapper around SystemClock.uptimeMillis()."