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

Change-Id: I50d3778a7874656803a38594c0cdb1a5f95be123