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

Change-Id: I931b244ead0c1a11f0678ccebbbb8ab01a196642