Revert "frameworks/base: fix lost setting"

This reverts commit 3affd069f8d30a332012792b1d450fc7e7058b76.

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