Merge "Add mm_event trace events to the atrace 'memory' category" into rvc-dev am: 5e614328d7

Change-Id: Ida66dcddaa0847dfa377a802f42df2a45dda4bef