Merge "remove testCpuTimePerFreq" into stage-aosp-pi-cts-dev