Merge "Revert "Don't log change reports to statsd from system server"" into main