Merge "Use autogenerated SysUiStatsLog for statsd logging"