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

Change-Id: I0393d702b3fd308dd16becefceea15f932fea599