Adapt BatteryService patches to Android 4.4

Change-Id: Ia8bf5bf9bd1f90336b2dc94721d9cef1ed70a992
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>