am 36ba8b1b: am ba7e39d5: am 92a3914f: Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev

* commit '36ba8b1b4c0822036b4652d3e134979fae89c54d':
  BatteryStats: Remove uid_cputime Slog.wtf for high cpu times