Try to fix build

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