Fix lock screen notifications and register listener

Conflicts:
	services/java/com/android/server/NotificationManagerService.java