Merge remote-tracking branch 'aospa-legacy/kitkat' into kitkat-legacy-staging
Merge branch 'kitkat-legacy-staging' of https://github.com/AOSPAL/android_packages_services_Telephony into kitkat-legacy-staging
TeleService: Fix in call vibration/event settings for MSIM

Original change: http://review.cyanogenmod.org/#/c/74451/
Original author: cretin45 <cretin45@gmail.com>

Change-Id: I7d36be5219fac6efd1103587918f5573abf28607

Edit 1: Fix build.
TeleService: use MSimPhoneFactory for MSIM devices

Original change: http://review.cyanogenmod.org/#/c/74882/
Original author: Shaleen Jain <shaleen.jain95@gmail.com>

Change-Id: I41ff21b1897cd36ea6bb24282e80c7345fc7b2d0
TeleService: Fix in call vibration/event settings for MSIM

Change-Id: Ibfd8aebe83bdd3d92642fac6b145ccde3300a28a
TeleService: Settings clean up

Change-Id: Ib087fd83db6f881fac2deb0912a6522bd1f52799
TeleService: fix event settings NPE

Has a bug in this commit when open Subscription settings:
Event settings already in Subscription settings - GSM call settings

http://review.cyanogenmod.org/#/c/74451/

PS2: This setting is added for non-world GSM phones only.
     Move this logic into the block that only gets executed for this case.
PS3: * Fix Event Notificatons for World Phone use case.
     * Don't call remove optional twice for msim.

Change-Id: I33fa9238b5a1715ce8a045a6d0b80bc66f9387e2
Remove duplicate caf strings from cm_strings.xml

Change-Id: I2a323a388710e4bbdf61a9781ca1231aafd910f4
Signed-off-by: cj360 <ayunker551@gmail.com>
Merge branch 'kitkat' of https://github.com/AOSPA-legacy/android_packages_services_Telephony into kitkat-legacy-staging