Merge "Modify SurfaceView to use SurfaceFlinger child surfaces."

core/java/android/view/SurfaceControl.java

core/java/android/view/SurfaceSession.java

core/java/android/view/SurfaceView.java

core/java/android/view/ViewRootImpl.java

...java/com/android/internal/view/SurfaceCallbackHelper.java

core/jni/android_view_RenderNode.cpp

core/jni/android_view_SurfaceControl.cpp

core/jni/android_view_SurfaceSession.cpp

core/jni/android_view_ThreadedRenderer.cpp

libs/hwui/TreeInfo.h

media/java/android/media/tv/TvView.java

services/core/java/com/android/server/wm/AppWindowToken.java

...core/java/com/android/server/wm/WindowManagerService.java

services/core/java/com/android/server/wm/WindowState.java

.../core/java/com/android/server/wm/WindowStateAnimator.java

...e/java/com/android/server/wm/WindowSurfaceController.java