Battery Saver Stuff

Conflicts:
	src/com/android/phone/PhoneInterfaceManager.java