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

Change-Id: Idb2ee2451b70ec553a49258f42dad38b10a7d157