Merge "Gestures: Assemble per-window exclusion zones"

diff --cc Android.bp
Simple merge

diff --cc core/java/android/view/IWindowManager.aidl
Simple merge

diff --cc core/java/android/view/ViewRootImpl.java
Simple merge

diff --cc services/core/java/com/android/server/wm/DisplayContent.java
Simple merge

diff --cc services/core/java/com/android/server/wm/RootWindowContainer.java
Simple merge

diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/wm/WindowState.java
Simple merge

diff --cc services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
Simple merge