Fix conflicts

Change-Id: I5239f58fca2e77e95f77d693fa4c31fb22743580
Revert "nav-ring customizations"

This reverts commit 0cf098d24bc3f7618ee62826b025dd9a54d5c123.

Change-Id: Ie9d9f66bfcb16a2ecc8c8969b277d8b95b2e9ff9
Revert "[1/2] base: NavigationBar customization"

This reverts commit 3b43f027395ba99a9ef6af68652a01f54bb66c5d.

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/layout/mid_navigation_bar_land.xml
	packages/SystemUI/res/values/ck_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java

Change-Id: I697cdccc5044422a138c1e30e47a82c727e773e5
Fix conflicts

Change-Id: I20d98c7445e2658506ff9926143c99d58811633e