Revert "frameworks: fix NullPointerException"

This reverts commit 0232673f343c27fb4af3de67fd16c0b5ffc1498e.
Revert "frameworks: phone always screen on and show notifications but we make user configurable"

This reverts commit 70282c30a1aa2e8356a337f7748ccb2b141ef6e4.

Conflicts:
	core/java/android/provider/Settings.java
	packages/Keyguard/src/com/android/keyguard/NotificationViewManager.java