Merge "Fix issue in CpuTimePerUid where microseconds are used as milliseconds"
am: 4314aef811

Change-Id: If2cecbfb4d59d3eb803da5161fdad214640d8889