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