Call cleanOtaScreen when otasp call is disconnected.

Call cleanOtaScreen to clear the OTA screen. Current
functionality does not clear ota screen when otasp
call is disconnected.

Change-Id: I5e6c19728fd18191de3ba65ce358e852dd7d9d57
CRs-Fixed: 599388
Add ME Depersonalization support.

Add support for all ME De-Personalizations as per specs
3GPP2 C.S0068-0 and 3GPP TS 22.022.

Change-Id: I70272a596a4ed6c7cf526ea7e944facebb7ce41d
CRs-Fixed: 467276
Avoid multiple PERSO_LOCKED notifications.

Do not register for PERSO_LOCKED notification on RAT Change.
PERSO_LOCKED is dependent on IccCard and not on Phone type so no
need to re-register again on RAT Change.

Avoid multiple PERSO_LOCKED notifications and hence avoid
multiple perso lock screens on UI.

Change-Id: I88093c6a0eb0e1ebd762bc0838f6d2d0246cfee4
CRs-Fixed: 576034
MSIM: Multisim Emergency call support

Add logic to pick best possible phone for placing
emergency voice call.

Change-Id: Ic08f81693f627d3da4adb0cc8f276d002132f34f
CRs-Fixed: 714237
Conflicts:
src/com/android/services/telephony/TelephonyConnectionService.java
Display the radio tech in manually PLMN search results

Display 2G/3G/4G suffix in the operator list to distinguish
different networks of the same operator.

CRs-Fixed: 522564
Change-Id: I007d1abcfba1532e94de712af9d76bf5099c193f
STK Call Control feature implementation.

Support to display the exact call failure reason
for STK cc.

Change-Id: I7b0678b8bd566593270d0d9b3459400a8fd08803
MSim: Add support to enable/disable mobile data

Extending mobile data api's per subscription

Change-Id: Ie585307c975c8c12a5b490e68b879046832b6132
IMS: Deflect call feature

Code changes to support IMS Deflect call feature.

Change-Id: I2e41455f101582fe743965a1fd5854fdb5ab18d6
CRs-Fixed: 713856
IMS: Dial API Modification to Support OEM Call Extras

Adding framework support to allow OEMs to send
extra information with the Dial Intent all the
way to the IMS service layer and beyond.

Change-Id: I823902de0c3c154f31d47649386f842a69335028
Fix apn population issue on msim

On multisim device, apns of DDS subscription
are getting displayed on both subs. This is
because of missing sub id value in the intent
broadcasted to start ApnSettings.
Pass subscription info along with the intent
in GsmUmtsOptions

Change-Id: I4fe13455f1d456bc10ea1254e0e3cc2fc47105a2
CRs-Fixed: 725081
Indicate PIN2 blocked on the third wrong PIN2 attempt.

EditFdnContactScreen's provider sends 0/1 to EditFdnContactScreen to
indicate failure/success of FDN contact's update operation.
If the update operation fails, UiccCardApplication is queried to
check if the PIN2 is blocked. This requires the UiccCardApplication to
be updated before the fdn contact screen can query it for the status
of the pin2. But if it happens otherwise, the fdn contact screen does
not recieve the correct  pin2 status and as a result an incorrect message
is displayed to the user.

Add a delay before posting the fdn contact's insert and update
operation result to the user. Therefore, the UiccCardApplication will
be queried for the pin2 status after the delay.

Change-Id: I1a2a2335c4d8074a102c79d45af0f2a71e09d780
CRs-Fixed: 549042
Add support for icc operator numeric

Change-Id: Ib34aaba6848929bdfad6c84389a48c3c4ff6ec7d
CRs-Fixed: 727780
MSIM: multisim ECall related changes

- Add support to update the phone account handle to Telecomm,
  this helps to update the proper subId info on InCallUI.
- get the defaut phoneId from ModemStackCOntroller for ECall.

Change-Id: Id7463c1b83efd3855986d7efb9a27098780aac60
CRs-Fixed: 722205
Ims: Send user selected TTY mode to lower layers.

Irrespective of whether TTY device is connected or not
send TTY mode setting to modem whenever user changes it
from settings.

CRs-Fixed: 698661

Conflicts:
src/com/android/services/telephony/TtyManager.java
Change-Id: Ib5a3708125ea5b4e1232eed2c441d2bdb79eb921
Add Support to get phone object and cell info API

Add support to get phone object based on phoneId.
Add support to get cell info based on subId.

--> Send radio power reuest on all available phone objects.

Conflicts:
src/com/android/phone/PhoneGlobals.java
Change-Id: If94c67b904e5b3be438257c7fb2397a265b49624
MSIM: Add multisim MMI code support

Register all available phones with CallManager to get
the MMI indications on all phones.

Change-Id: Ifc6819c6ebc317dc8c0f17471cb6da0af438f217
CRs-fixed: 714236 714238
SimContacts: Add support for manage SIM Contacts.

Add support for new options in SimContacts
    1) Add New contacts to SIM
    2) Delete/Edit Contact in SIM
    3) Dial/SMS using SIM contact
    4) Export all Phone contacts to SIM

Conflicts:
res/values/strings.xml
src/com/android/phone/SimContacts.java
Change-Id: Ic428111f548c294f956906e92a0839eed5ae137e
Add support for Manage SIM Contacts for MultiSim

ExportContactsToSim.java
Add Support for Exporting SIM contacts for all available SIMs.

SimContacts.java
Add support for Managing SIM contacts for all available SIMs.

PhoneInterfaceManager.java
Modify hasIccCard() to change slotId type from long to int.

Change-Id: Ib2f7907ca7b008455f39ba0a3eae78b34b75513f
Fix to dismiss only the dialog in case of error

Dismiss only the error dialog when there is exception for setting
call waiting option.

Change-Id: I284e11184f623f22f16e6205194da5949fe5fd81
CRs-Fixed: 712904
Display correct message while importing contacts in APM

Check for Card state before displaying message to the
user when airplane mode is ON.

CRs-Fixed: 599392
Change-Id: I6d881bbbf04faacc6f382405e29b4cdc8a61ec13