Merge "Add mm_events trace instance" am: 7dfe58cc10 am: 35176df5ba

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1553634

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I571d1e18f26b2111058d586120c168feb84841cd