Active notifications:

combine active display and lockscreen notifications. Also improve
and modify/fix up the originals

David96 -> lockscreen notifications
clark scheff -> active display

Change-Id: I91c00dbfbb302a0de43f202f1c957380d62ec809
Merge "Active notifications:" into kk44