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

Change-Id: Ia15bc54c61a692a37ad9b84a28643afc798b52c7