Raw Cornerstone patch with conflicts

Change-Id: I5e4fa17bcb4c6e5d3fdd9dfd430910c2263b9561

Conflicts:
	core/java/android/app/ActivityManagerNative.java
	core/java/android/app/IActivityManager.java
	core/java/android/view/IWindowSession.aidl
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/am/ActivityManagerService.java
	services/java/com/android/server/am/ActivityStack.java
	services/java/com/android/server/wm/DimAnimator.java
	services/java/com/android/server/wm/DimSurface.java
	services/java/com/android/server/wm/WindowManagerService.java
	services/java/com/android/server/wm/WindowState.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java