Merge changes from topic 'battery_prop'

* changes:
  storaged: account on/off charger per uid io usage
  healthd: return battery status property