Merge change 21154

        if (event.values[0] == 0.0) {

            goToSleep(milliseconds);

        } else {

            // proximity sensor negative events user activity.

            // temporarily set mUserActivityAllowed to true so this will work

            // even when the keyguard is on.

            synchronized (mLocks) {

                boolean savedActivityAllowed = mUserActivityAllowed;

                mUserActivityAllowed = true;

                userActivity(milliseconds, false);

                mUserActivityAllowed = savedActivityAllowed;

            }

        }

    }