Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev