Merge "Log screen-on latency with tron" into oc-dev
am: 2b499e4eba

Change-Id: I403d3daa5c12dc1465ae8d1a37dc6cddc27f18f9