Don't go into full suspension when proximity is triggered

Change-Id: I5e18e9dd820a1586f2be21946b1199db9ba8e834
Merge "Don't go into full suspension when proximity is triggered" into kk4.4