Frameworks: fix sdk build

ups....derp

Change-Id: I990ec0808b6aa264b4d92d6829484441e4c842e6

Conflicts:
	core/java/android/view/WindowManager.java
Keyguard: Ensure that a widget and page is attached before attaching the ChallengeLayout.OnBouncerStateChangedListener

otherwise it can result in a NPE due that the page was not loaded. Especially on low end
devices this can happen (see zoomOutToBouncer() method @KeyguardWidgetPager)

Change-Id: I7e940eb2fdf885f158f4c5ff2872ebafcda76da0