Merge "[DO NOT MERGE] Log Winscope tracing with the frame composition time" am: 104972e936
am: 9d2bdf2535

Change-Id: I45264179707c527e49b9a5a00efc3ae121e055a7