Merge "libbatteryservice: Add average current property"