[automerger skipped] Merge "mm_events: Add knob to remove mm_event tracing...

[automerger skipped] Merge "mm_events: Add knob to remove mm_event tracing instance" am: f4d123f8 am: 97f85756 -s ours

am skip reason: Merged-In I89d7e5e1cd0d32b5612bc419b1a1c4b8c3c8ade6 with SHA-1 b9ba8cf2 is already in history

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

Change-Id: I72b0229d429d95a8c16445af0607cca7472e9cca