Merge "Clean up unnecessary interfaces of WindowManagerPolicy"