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

Change-Id: I1954ae85025dabfebf452228b199cab07e892be2