Merge "Fix additive fields for CpuTimePerUidFreq" into rvc-dev