Merge "Combine uids for CpuTimePerUidFreq atom"