Merge "Abort queued-sleep transition if display shouldn't sleep anymore" into udc-dev

                final Transition transition = new Transition(TRANSIT_SLEEP, 0 /* flags */,

                        display.mTransitionController, mWmService.mSyncEngine);

                final TransitionController.OnStartCollect sendSleepTransition = (deferred) -> {

                    if (deferred && !display.shouldSleep()) {

                        transition.abort();

                    } else {

                        display.mTransitionController.requestStartTransition(transition,

                                null /* trigger */, null /* remote */, null /* display */);

                        // Force playing immediately so that unrelated ops can't be collected.

                        transition.playNow();

                    }

                };

                if (!display.mTransitionController.isCollecting()) {

                    // Since this bypasses sync, submit directly ignoring whether sync-engine