Revert "Navbar merge fixes"

This reverts commit 9ec924d49d4ba434707eda95358c7a3a58ab0548.

Conflicts:
	packages/SystemUI/res/values/config.xml

Change-Id: I44d76610ae5c7d6dc04a8e76c7265f9951077aa7
fix navbar transparency

Change-Id: I6c302e86ad5657a9dfb5072a2e70bdc8cee4ec83