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

Change-Id: I561e64cf886ccde29112f471e657ccada46858f0