[automerger skipped] Merge "First draft of StatsEvent.java" am: 4e2e5a96b8 am: 2a6214ca33
am: 9886a9c50b -s ours
am skip reason: change_id I508fa3d2f84850438562d01c78155590819badca with SHA1 dc6747c6d7 is in history

Change-Id: I9d51c9e037943795a4e9c992b6f6bd3e43c1a1f0