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

Change-Id: I2374b89a8124f588a9358ba43e0fc5dc3da5b8b6