Bacon : Add proximity check support

Change-Id: I7c24da09b94ce6581f63e76c17f38a73afa4a996
(cherry picked from commit 3ccf5ea7b77e1452f2b40c30efd6569e0369a585)

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