Fix prox and wake sensor conflict

Test: manual
Bug: 111414690
Bug: 111405682
Change-Id: I5c625936781bb8404c4b1507a164c9dfe7d76f29
2 files changed