added option to not disable proxy sensor if dialpad is shown

Change-Id: I0711445f676553090ae5964103f04413ce6ca89f

Conflicts:
	res/xml/call_feature_setting.xml
Merge branch 'jb-mr2' of https://github.com/maxwen/packages_apps_Phone into jb-mr2