Lockscreen Notifications: some small fixes

Change-Id: I77665e37d823c619680312b73d5ebb1e6e437ffd

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