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