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

Change-Id: I6a1ac4ceee2ba943965382fc5cb7c782249b19a2