[automerger skipped] Merge "[DO NOT MERGE] Log Winscope tracing with the frame composition time" am: 104972e936 am: 9d2bdf2535
am: 630523fd32 -s ours
am skip reason: subject contains skip directive

Change-Id: I4c1e67b6fbc0b91c2f330a2bcc7aec00cdaaecce