am 81a055a7: am aa8bd6e9: am 91cccaaf: Merge "Telephony: Always create IccCard"

* commit '81a055a7b9e3049413a503fa61c09f3f43648d78':
  Telephony: Always create IccCard
am 95f35828: am 81a055a7: am aa8bd6e9: am 91cccaaf: Merge "Telephony: Always create IccCard"

* commit '95f35828170db0cb4001ae061f7d11d232868cc2':
  Telephony: Always create IccCard
Merge commit 'd9d3f48c' into fix-merge-conflict



* commit 'd9d3f48c':
  Telephony: Unregister broadcast receiver

Change-Id: I57a974e92592efa8a662f083dd1bfc613c1a945a
am 208f334f: Merge commit \'d9d3f48c\' into fix-merge-conflict

* commit '208f334f85a5e5182a98aefb56066443a2de5261':
  Telephony: Unregister broadcast receiver
am 1f59196c: am 208f334f: Merge commit \'d9d3f48c\' into fix-merge-conflict

* commit '1f59196ce1e6b612224eeb2c51d37489b289b9dc':
  Telephony: Unregister broadcast receiver
Telephony: Ignore SipPhone

UiccController's code isn't ready to handle having multiple
different PhoneBase objects working at the same time

Bug: 6975696
Change-Id: I8f83174cc7db478743445c09fb8f03c66cf1e41e
Merge "Telephony: Ignore SipPhone"
am 640ac806: Merge "Telephony: Ignore SipPhone"

* commit '640ac8068f3941dcf79c0496285758d4b8180847':
  Telephony: Ignore SipPhone
am 3a7fdcb7: am 640ac806: Merge "Telephony: Ignore SipPhone"

* commit '3a7fdcb7918fd4e68814952b545c89fb971e5356':
  Telephony: Ignore SipPhone
am 4a558a7b: am 3a7fdcb7: am 640ac806: Merge "Telephony: Ignore SipPhone"

* commit '4a558a7b6494361fb0b3ac5ebb4f40f8e778ac5f':
  Telephony: Ignore SipPhone
am fd1c8517: am 4a558a7b: am 3a7fdcb7: am 640ac806: Merge "Telephony: Ignore SipPhone"

* commit 'fd1c85175a498978b394258b34c9c52b5b51d860':
  Telephony: Ignore SipPhone
Merge "Telephony: Fix SmsManager to throw IllegalArgumentException"
am a462a18c: Merge "Telephony: Fix SmsManager to throw IllegalArgumentException"

* commit 'a462a18c25eb2a09b0f3c15d3a3c231b25448f0b':
  Telephony: Fix SmsManager to throw IllegalArgumentException
am 342f21b8: am a462a18c: Merge "Telephony: Fix SmsManager to throw IllegalArgumentException"

* commit '342f21b85d51d4216192a4e8b9fe6d6706b9bb3e':
  Telephony: Fix SmsManager to throw IllegalArgumentException
am 79dbf561: am 342f21b8: am a462a18c: Merge "Telephony: Fix SmsManager to throw IllegalArgumentException"

* commit '79dbf5616c72262355bb66bf1a2f70da5ceea015':
  Telephony: Fix SmsManager to throw IllegalArgumentException
am cd0425c4: am 79dbf561: am 342f21b8: am a462a18c: Merge "Telephony: Fix SmsManager to throw IllegalArgumentException"

* commit 'cd0425c4a1b9e2149edfbcc1a1ae9c4a7a50a208':
  Telephony: Fix SmsManager to throw IllegalArgumentException
Telephony: Fix MT SMS with invalid TOA field causing crash issue

Throw FormatException when type of number is incorrect and handle it

Change-Id: I305ea1c9e4fee29c84caefec7d7564d46228851d
Telephony: Fix LTE CB Sms for dual-mode devices

Ignore 3gpp location information when it is not available.
This is required to support dual-mode devices such as CDMA/LTE devices
that require support for both 3GPP and 3GPP2 format messages.

Change-Id: Ie5d6372ef7e8da6893800e05a83ba840b7fd31f6
Merge "Telephony: Fix LTE CB Sms for dual-mode devices"
Merge "Telephony: Fix MT SMS with invalid TOA field causing crash issue"