Fix in SystemUI force closing when Active display is enable

Change-Id: I7b8ed2318049a7942d743812f32ef68346c43cfb
(cherry picked from commit 7d11a1bc1ad804631084b01c47589275262ea21b)

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

(cherry picked from commit e6b16d9bedc58ca5440c9e5d07266afea1bd1c38)

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