Revert "Base: update Immersive mode"

This reverts commit 8c5db4647cb5e5a2f8f070da0bfb40d933caacd3.

Conflicts:
	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java