Merge "Replace consumeNextDraw with SurfaceSyncer" into tm-dev

import android.view.SurfaceControl;

import android.view.View;

import android.view.ViewRootImpl;

import android.window.SurfaceSyncer;

import androidx.annotation.Nullable;

                tx.setScale(dragSurface, scale, scale);

                tx.setAlpha(dragSurface, alpha);

                tx.apply();

                tx.close();

            }

        });

        mReturnAnimator.addListener(new AnimatorListenerAdapter() {

                maybeOnDragEnd();

                // Synchronize removing the drag surface with the next draw after calling

                // maybeOnDragEnd()

                viewRoot.consumeNextDraw((transaction) -> {

                SurfaceControl.Transaction transaction = new SurfaceControl.Transaction();

                transaction.remove(dragSurface);

                    transaction.apply();

                    tx.close();

                });

                viewRoot.getView().invalidate();

                SurfaceSyncer syncer = new SurfaceSyncer();

                int syncId = syncer.setupSync(transaction::close);

                syncer.addToSync(syncId, viewRoot.getView());

                syncer.addTransactionToSync(syncId, transaction);

                syncer.markSyncReady(syncId);

                mReturnAnimator = null;

            }

        });