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

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