Don't go into full suspension when proximity is triggered

Change-Id: I2a91722b61050698b6684da0a06d959c046416da

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml