[automerger skipped] Merge "stats_event_list changes for statsd mainline api"...
[automerger skipped] Merge "stats_event_list changes for statsd mainline api" am: f95468d3 am: 930d0405
am: f61390da -s ours
am skip reason: change_id I4163edc80ffcca61db7ab2a1e14ae8c14aab2347 with SHA1 4c2f079d is in history
Change-Id: I2257736a6b71136cb46a415f726c46e0747d3bea