Merge "Add mm_event trace events to the atrace 'memory' category" am: caeafbfce3 am: d9feea395f

Change-Id: I5a9b5e5dbfab413d71503079281d5daaaeb8a048