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

Change-Id: If1338ca0d87160a79eea251e8c2c87b5b55df980