Merge "Annotate test method visibility in WindowManager" into oc-dev am: 0b83588177
am: 35eb249ebb

Change-Id: I3d20aa3c99046b6185695f8e85f7a61474620d4d