Merge "batteryservice: add BATTERY_PROP_STATE_OF_HEALTH" into udc-dev