Merge "Display Cutout: Dispatch Cutout from WindowManager"

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

diff --cc services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge

diff --cc services/core/java/com/android/server/policy/WindowManagerPolicy.java
Simple merge

diff --cc services/core/java/com/android/server/wm/TaskSnapshotSurface.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