Revert "Fix notif .java file" Try to fix build

This reverts commit deb0a58f7b29ed41a92e1f897f4418532e0802bf.

That was my bad, now i will see if reverting this build works

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