Merge "Reduce use of static variables in window manager unit tests" into oc-dev
am: 0f8764485b

Change-Id: Ia10f8954ec3524cd76f0327f8edc0bb04f90915d