Merge "Add mm_events trace instance" am: 7dfe58cc10

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e3dbc80cb73c26b2d683370127321a6de2e2103