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

* commit '92a3914fb353b725646a96185d1c1daaf3977e7b':
  BatteryStats: Remove uid_cputime Slog.wtf for high cpu times