Merge "Combine CpuTimePerUidFreq uids using base uids"