Merge "Report negative proximity if we lose the prox sensor" into tm-qpr-dev

                sendOnProximityNegativeWithWakelock();

            }

        } else {

            setProximitySensorEnabled(false);

            mWaitingForNegativeProximity = false;

            mIgnoreProximityUntilChanged = false;

            if (mScreenOffBecauseOfProximity) {

                // The screen *was* off due to prox being near, but now there's no prox sensor, so

                // let's turn the screen back on.

                mScreenOffBecauseOfProximity = false;

                skipRampBecauseOfProximityChangeToNegative = true;

                sendOnProximityNegativeWithWakelock();

            }

        }

        if (!mIsEnabled