[automerger skipped] Merge "Add mm_event trace events to the atrace 'memory'...
[automerger skipped] Merge "Add mm_event trace events to the atrace 'memory' category" into rvc-dev am: 5e614328 am: 0e20be68 -s ours
am skip reason: Change-Id Ia5e13cf0aaaeb88c0c6efa68f89427b01af81f97 with SHA-1 65bc2aef is in history
Change-Id: Ifadee185968d66dcb4782d729c981c329e6eeb4d