Merge "Add suspend_resume trace events to the atrace 'freq' category." am: e3aff37dc7
am: c83671c60d

Change-Id: I5f5119dc7d56add24b09365c5b8629c374349702