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

* commit '8e81f6164e93c8a69dc196d83e0a8ee0ebb7297e':
  BatteryStats: Remove uid_cputime Slog.wtf for high cpu times