am 40627de3: Merge "Remove unnecessary references in WindowManagerService"

* commit '40627de3044c4a23c20c2229cab20aab21ff2b03':
  Remove unnecessary references in WindowManagerService