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

* commit 'd3b9dd6ca6325abe5cf2049c2894a86b256a3db1':
  Remove unnecessary references in WindowManagerService