Merge "[frameworks][base][statsd] fix -Wimplicit-int-float-conversion"