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

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