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

Change-Id: I5e0a99a9b56bd0cb649fbd345e8fa0f6d6fe146e