Merge "Add tests for validating cpu freq times in batterystats dump."