Merge "Fix issue in CpuTimePerUid where microseconds are used as milliseconds"...
Merge "Fix issue in CpuTimePerUid where microseconds are used as milliseconds" am: b2498be8 am: 8a5fecdd
am: e20d08ff
Change-Id: I924f36458feea87d238294c6ff887da1303d98b3