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

Change-Id: I35349182930746416b7f0b457597fe091ef84f68