am 24f66460: am a72f9451: Merge "Use the same logic in isDataPossible as GSM." into jb-mr1-dev

* commit '24f664604dc0520d123f6b4b69d6a395011ad347':
  Use the same logic in isDataPossible as GSM.
am 7fb2d14f: am 4658a1a8: Add support for per-package policy for sending premium SMS.

* commit '7fb2d14fe0c1cace30af881c5c9af9b8be85f57e':
  Add support for per-package policy for sending premium SMS.
Telephony: Add null pointer checks in UiccCardApplicaton.update

Bug: 7174617
Change-Id: Iad5ef2352ea5e6ef4ede87214036ef27cc6a95ef
Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"
am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"

* commit 'f667af23e53602cf0b7f1400ea0b7564764bf5ca':
  Telephony: Add null pointer checks in UiccCardApplicaton.update
am 5d9a7e45: am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"

* commit '5d9a7e454c5c71ef15527f06278b18996d0cc191':
  Telephony: Add null pointer checks in UiccCardApplicaton.update
am 38953327: am 5d9a7e45: am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"

* commit '38953327bdab42c3975528ed416a6af0d4273a7f':
  Telephony: Add null pointer checks in UiccCardApplicaton.update
am 4a6e52f2: am 38953327: am 5d9a7e45: am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"

* commit '4a6e52f2f5db93fdf339de7e92e0a23659985019':
  Telephony: Add null pointer checks in UiccCardApplicaton.update
am ebef0ba6: am 4a6e52f2: am 38953327: am 5d9a7e45: am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"

* commit 'ebef0ba67576c4d137f4c338a91eb571f4f963b3':
  Telephony: Add null pointer checks in UiccCardApplicaton.update
Telephony: Fix npe in IccPhoneBookInterfaceManager

Create new interface to get current uicc app type from
phone and use that

Bug: 7167839
Change-Id: I4787985593918c660a254c9826734cf9c963bff0
Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"
am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"

* commit '54cadb79d3d2ef5be670d2fbd6e566f0a5f7f428':
  Telephony: Fix npe in IccPhoneBookInterfaceManager
am 7b5e41b5: am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"

* commit '7b5e41b5aca925ef476bf670a1f65f1cb51bac83':
  Telephony: Fix npe in IccPhoneBookInterfaceManager
am ed6a91f6: am 7b5e41b5: am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"

* commit 'ed6a91f6b4fb5e33406034f13d21897de70b506b':
  Telephony: Fix npe in IccPhoneBookInterfaceManager
am 167a784e: am ed6a91f6: am 7b5e41b5: am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"

* commit '167a784eb797781d89049a9fbc90aa6684fcb7e5':
  Telephony: Fix npe in IccPhoneBookInterfaceManager
am 9f66e1bb: am 167a784e: am ed6a91f6: am 7b5e41b5: am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"

* commit '9f66e1bbc9bcec9e80ed50435c79b61afe9c56fb':
  Telephony: Fix npe in IccPhoneBookInterfaceManager
Fix string in sms_short_code confirm dialog.

Typo used the wrong string giving "allow, allow" options after toggling
the remember-my-choice checkbox.

bug:7198380
Change-Id: Ia9bf3da44a1153838c618bd8c6b722235629e853
am 5d875796: Fix string in sms_short_code confirm dialog.

* commit '5d875796122cdd8a7004e8e3964b20b5c65a31a1':
  Fix string in sms_short_code confirm dialog.
am a09da553: am 5d875796: Fix string in sms_short_code confirm dialog.

* commit 'a09da553297e6ca61e878bd03b8ed177e0bc1fbf':
  Fix string in sms_short_code confirm dialog.
Add gservices-controllable rules policy.

Allows using SIM country, network country or the most restrictive of both.
bug:7205426

Change-Id: I4f7ec6ef884d8cc3665fe60290c167740f17d9e7