Merge "Fix issue in CpuTimePerUid where microseconds are used as milliseconds"