Provide compatibility to existing AlarmClock shortcuts.

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