DeskClock: Support double-digit hours for timers

Change-Id: I8aa4960c03d710ca7889c8d91701ca5b5376c9ef
Merge remote-tracking branch 'cm/cm-11.0' into HEAD