Merge "SurfaceControlViewHost: Clone control for SurfacePackage" into tm-dev am: bb4e0de2de

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16980564

Change-Id: I75e77ff227e7164ba7ed43ecc93a440612532e48

core/java/android/view/SurfaceControlViewHost.java

@@ -328,7 +328,8 @@ public class SurfaceControlViewHost {
      */
     public @Nullable SurfacePackage getSurfacePackage() {
         if (mSurfaceControl != null && mAccessibilityEmbeddedConnection != null) {
-            return new SurfacePackage(mSurfaceControl, mAccessibilityEmbeddedConnection,
+            return new SurfacePackage(new SurfaceControl(mSurfaceControl, "getSurfacePackage"),
+                mAccessibilityEmbeddedConnection,
                 mWm.getFocusGrantToken(), mRemoteInterface);
         } else {
             return null;