Reset battery stats [1/2]

Conflicts:
	core/java/android/content/Context.java