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

Change-Id: Ie38aa71ee58d7fc8992153e3af65c02c1adb9e10