Revert "[1/2] FB: Make menu unlock configurable"

This reverts commit f858e12fa9b9e335a8effd6297bd3f613038baef.

Conflicts:
	core/java/android/provider/Settings.java