Merge "Reduce the visibility of logging to statsd to package-private" into main