Fixed issue with battery switching at random

Change-Id: I8d843e148bdaf08134ed5a6bff9ca134d43753c3

Conflicts:

	core/java/android/provider/Settings.java