Revert "hammerhead: Make proximity check opt-in"

This reverts commit 0e40f4b9815e0c1312f2ab6127719c361a745c38.
Device: Tune some values

Change-Id: If11d688b809be5c3c04fbe200fbc0b5f7d154427