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

Change-Id: I11ecf8923cc3fe6c8b44a446086c267e50a89911