(2/2) Allow disabling of FC dialogs

Change-Id: If87aa74ebb45849f6e5fe3a53ce9beeaac28f624

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