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

Change-Id: I78470d6cc8e6e42adc50407f04b0294b9b1e159a