base

DO NOT MERGE - cherry-picked from master:

PowerManager: Fix problem waking screen from negative proximity sensor events.

Fixes bug b/2048591

Signed-off-by: Mike Lockwood <lockwood@android.com>