Add Settings to be reset

Change-Id: I82e3706b94da0a08cfbee478a39a8daa9a09e7fe

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