please don't die

Change-Id: Id5d1ec1c1646fd72655aa290823fac174a79c76c

Conflicts:
	packages/Keyguard/src/com/android/keyguard/NotificationHostView.java

Conflicts:
	packages/Keyguard/src/com/android/keyguard/NotificationHostView.java