[automerger skipped] Merge "Simplified stats_event.c; exposed getter methods" am: d054eb7310 am: b2aacf613e am: 1506bfd95e -s ours
am skip reason: Change-Id I0173f8bc76ef25118379dce5d2481f5f7a9b7519 with SHA-1 0ca5f8d0f1 is in history

Change-Id: Iab91a36befea3e40000b4fb12308f6363c200207