Merge "frameworks/base: remove redundant code in WindowManager"