Merge "Fix possibility of ScrollView not allowing clicks after a fling"

                /*

                 * If being flinged and user touches the screen, initiate drag;

                 * otherwise don't. mScroller.isFinished should be false when

                * being flinged.

                 * being flinged. We need to call computeScrollOffset() first so that

                 * isFinished() is correct.

                */

                mScroller.computeScrollOffset();

                mIsBeingDragged = !mScroller.isFinished();

                if (mIsBeingDragged && mScrollStrictSpan == null) {

                    mScrollStrictSpan = StrictMode.enterCriticalSpan("ScrollView-scroll");