Merge "Use destroy in transaction for animation"

diff --cc core/java/android/view/SurfaceControl.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/RecentsAnimationController.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/WindowContainer.java
Simple merge

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

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

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

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