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

Change-Id: I7493d9e0badeac81abd86856ce5415d83ca1e8ee