This reverts commit de97cfd0. Reason for revert: CtsWindowManagerDeviceTestCases Change-Id: I57a397d3830505a5004fe647ccbd95ac5f0168e9