Merge "Fix invalidate rotation value which causes CTS failures" into tm-qpr-dev

                        false /* forceRelayout */);

            } else {

                // Revert the rotation to our saved value if we transition from HALF_FOLDED.

                if (mHalfFoldSavedRotation != -1) {

                    mRotation = mHalfFoldSavedRotation;

                }

                // Tell the device to update its orientation (mFoldState is still HALF_FOLDED here

                // so we will override USER_ROTATION_LOCKED and allow a rotation).

                mService.updateRotation(false /* alwaysSendConfiguration */,