Merge "Added trace event to screenrecord"
am: e9239dbe79

Change-Id: I786445ef718d73192ff9c94ab4482232154a1b85