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

Change-Id: I5ded43fc89c1d3720012c564cabbc6ba254a2f01