Merge "Zen: Classify notifications using the alarm stream." into lmp-dev