Fix battery % always showing at < 100%

Change-Id: I9ce697e824e1f85becfd0e53519d3ae36fc65758

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