Merge "Combine uids for CpuTimePerUidFreq atom" into rvc-qpr-dev