m7-common: Re-enable & Set proximityCheckTimeout to 400

Change-Id: I2903e3ae1b8ff92f1d9f9f7d25e728a5a9aa3825