Ability to disable hardware keys via nav bar settings (2/2)

Conflicts:

	core/java/android/provider/Settings.java