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

Change-Id: I2f80936a8daffacf73363b6d338f27a16f30a3de