settings: Fix loading of some initial values

Change-Id: I41658dd8dc3f31b4463ae4d4f3cd6f480a0ccba3

Conflicts:
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java