Merge "Added trace event to screenrecord" am: e9239dbe79 am: 1dd33eacee am: ea826c6eb1
am: 5f6132f740

Change-Id: I8c4b582568f740c953e588f1e2194aedd549fb70