Merge "Remove the testCpuTimePerUidFreq CTS" into pi-dev