Merge "batteryservice: update BatteryHealth type"