add proxomity flag

Conflicts:

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

Change-Id: I68c0fe2fd2070e581eeef2590f49508cdb524afa
(cherry picked from commit d7ca44928a27c5917ef2e5058562d17d491e6bab)
Location overlays: moto_msm8960 and oppo/apq8064 use these. I'm going to assume samsung hasn't joined that club.

Change-Id: I05001a7e9518efd53219d492e64339603aaba4ae
(cherry picked from commit ddcc67c38c3a0b60db19ecb4282481ed5cdc2055)

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml
overlay: this seems like a good idea.

Change-Id: I49c944a5467a6340ce22532ae8ad72f7bc7444b9
(cherry picked from commit cdddbfaf14afde6a33e1c12c4998a389796ae138)
configs: remove the pn544 nfc configs for now

(cherry picked from commit 5893704c58b6c33566837d6be9deb7ad6b47846c)
further nfc tests

(cherry picked from commit 6e504cbe920c6841e2add53ec2639b64e1584b14)

Conflicts:
	device.mk