[automerger skipped] Merge "First draft of native StatsEvent API" am: 5158ab9ff2 am: 3ccb84e989 am: 70fda92902 -s ours
am skip reason: Change-Id I0da9740d29749d79d14be39e5949b98c58df704d with SHA-1 6baeca576a is in history

Change-Id: I459982bbbb171412531dce035eacb1c24007939c