Rework Navbar Settings and add Slims navbar and navring

Conflicts:
	res/values/psx_arrays.xml
	res/values/psx_strings.xml
	res/values/ras_dimens.xml
	res/xml/bars_settings.xml
	res/xml/navigation_bar_settings.xml
	src/com/android/settings/rascarlo/NavigationBarSettings.java
Revert "Rework Navbar Settings and add Slims navbar and navring"

This reverts commit 7b13e52527b3d9da7c243a46bcadf5d87a48c962.
Revert "Navigation bar custom height"

This reverts commit 67cad9fd149d4606f7e41b05127528b9acb25d28.
Rework Navbar Settings and add Slims navbar and navring
correct navbar landscape default value for reset

Change-Id: I18e4eb23c34e57e5aed22523b0ebcb3bfda86834
Merge remote-tracking branch 'origin/navbar' into navbar