am cf04021a: Merge "Allow "Silent" to be set as a Timer ringtone." into ub-deskclock-charm

* commit 'cf04021a94d5c778fc999b33b714687f5b8f463e':
  Allow "Silent" to be set as a Timer ringtone.