Merge "Add VOICE_CANCEL_ALARM/VOICE_DELETE_ALARM intents."