Fix Phone > Settings > Call Settings FC on MSIM
and add flip to msim
Fix Phone > Settings > Call Settings > Sub Settings fc as well
Added Non-intrusive switch
Add Proxmimity Speaker
Add Blacklist
Switch checkboxes to switches

Change-Id: I232bed5af12e693c7f4a2615c76eff9737bd3325

Conflicts:
	res/xml/call_feature_setting_msim.xml
	src/com/android/phone/msim/MSimCallFeaturesSubSetting.java
2 files changed