am 96460182: am 8be07748: Merge "Timer sample app now uses Set a timer voice command instead of Set alarm." into klp-modular-dev

* commit '96460182ced2bcfef58dcb13edf1241b7ac7068e':
  Timer sample app now uses Set a timer voice command instead of Set alarm.