reconcile WindowManagerPolicy w/ cm-11.0

Change-Id: Ie9f90f027ee6f4cb29589b489adebc2dbd692295