Merge "[frameworks][base][statsd] fix -Wreorder-init-list"
am: 00ae277630

Change-Id: Icf1d23aba020cec0b084c435cfcf2a2ca4a66f83