Merge "[frameworks][base][statsd] fix -Wimplicit-int-float-conversion" am: 8b178a6607 am: 4a3a9b4a9f
am: 9c9a8c5642

Change-Id: I43109c22eac3266b1c9bce6591ee188340ff2816