Merge "Fix TextClockTest to work when time starts as 12-hour mode." into pie-cts-dev