Revert "Navbar: Bring inline with AOKP frameworks"

This reverts commit 381224473ee1d90b93e856f0f5f6c99ebadf18b3.

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java