Merge changes I9881453b,I57fa88c6 into stage-aosp-master am: c227f6f1

        Color color = Color.valueOf(colorInt);

        mColorLayerCounter++;

        // Only apply the background color if the TDA is actually attached and has a valid surface

        // to set the background color on. We still want to keep track of the background color state

        // even if we are not showing it for when/if the TDA is reattached and gets a valid surface

        if (mSurfaceControl != null) {

            getPendingTransaction()

                .setColor(mSurfaceControl, new float[]{color.red(), color.green(), color.blue()});

                    .setColor(mSurfaceControl,

                            new float[]{color.red(), color.green(), color.blue()});

            scheduleAnimation();

        }

    }

    void clearBackgroundColor() {

        mColorLayerCounter--;

        // Only clear the color layer if we have received the same amounts of clear as set

        // requests.

        if (mColorLayerCounter == 0) {

        // requests and TDA has a non null surface control (i.e. is attached)

        if (mColorLayerCounter == 0 && mSurfaceControl != null) {

            getPendingTransaction().unsetColor(mSurfaceControl);

            scheduleAnimation();

        }