Fix setting confirmation helper derp

Conflicts:
	core/java/android/util/SettingConfirmationHelper.java