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

Change-Id: Ie7691a19ef61668afd9200c9a3c77fa9fc5368f1