Keep the display on while stopwatch or timer is running

Change-Id: Id192d12b7e42c30cf8c2c258e885badfc3c02cb3
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_DeskClock into cm-10.1