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

Change-Id: Ie366e2caeb959f092a2dac937231a439c4f4a23f