TeleService: Fix in call vibration/event settings for MSIM

Change-Id: Ibfd8aebe83bdd3d92642fac6b145ccde3300a28a
TeleService: Settings clean up

Change-Id: Ib087fd83db6f881fac2deb0912a6522bd1f52799
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	src/com/android/phone/PhoneUtils.java

Change-Id: If5783453fe1ddd28598632002febcf7a21237f5b