Merge "Revert "Revert "Use autogenerated SysUiStatsLog for statsd logging""" into ub-launcher3-master