Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev am: aff7c3c71e
am: 1768a0054d

Change-Id: Ic22cc9e7289479e8e7df8db961b240db93721a15