Merge "Update ro.boottime.init units for statsd" into main