Merge "BatteryService(jni): properly handle read's return value" into ics-mr0