Merge "Added more systrace points to window manager" into oc-dev am: 182d5ec2d2
am: 0e068632ef

Change-Id: I70d155d214a70fb451bb7468d91e782f0f6f4d49