heads-up notification in Lollipop+
Merge branch 'ice-cream-sandwich' into beta-ics