Merge "Improve efficiency for CpuTimePerUidFreq" into pi-dev