Proximity-Fix

Change-Id: I736f2cf72c413b996fb572f0cea74021a5011480

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