Merge commit 'android-4.4.1_r1' into merge_branch

* commit 'android-4.4.1_r1': (21 commits)
  if provisioning apn conditionally restart the radio.
  Do not attempt to configure null preferred activity
  Telephony: unchange SIM info from CDMAPhone when SIM exists
  Use settings DB only when mcc/mnc matches SIM
  Update preferred activity for SMS related SENDTO intents
  Notify all ApnContexts on a conn of Disconnect
  Fix documenation IMS registration state.
  Fix GSMPhone.getServiceState() when mSST is null.
  SMS over IMS bug fixes
  Add single-pdn arbitration.
  Use new PhoneNumberUtils method for CDMA MO SMS formatting.
  Do not display dialog when PUK attempts remaining is 0.
  When phone changes update InBoundSmsHandlers and CellBroadcastHandlers.
  problem to send SMS message by bluetooth MAP profile.
  add SMS write permission for bluetooth package to support MAP profile.
  When phone changes update InBoundSmsHandlers and CellBroadcastHandlers.
  Telephony:  set default language of Canada as 'en'
  Few PIN/PUK fixes
  Fix bug in isOperatorConsideredNonRoaming
  more sms provider docs
  ...

Conflicts:
	src/java/android/telephony/SmsManager.java
	src/java/android/telephony/SmsMessage.java
	src/java/com/android/internal/telephony/BaseCommands.java
	src/java/com/android/internal/telephony/CellBroadcastHandler.java
	src/java/com/android/internal/telephony/CommandsInterface.java
	src/java/com/android/internal/telephony/IccCard.java
	src/java/com/android/internal/telephony/ImsSMSDispatcher.java
	src/java/com/android/internal/telephony/InboundSmsHandler.java
	src/java/com/android/internal/telephony/Phone.java
	src/java/com/android/internal/telephony/RIL.java
	src/java/com/android/internal/telephony/SMSDispatcher.java
	src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
	src/java/com/android/internal/telephony/cdma/CDMAPhone.java
	src/java/com/android/internal/telephony/cdma/CdmaInboundSmsHandler.java
	src/java/com/android/internal/telephony/cdma/CdmaMmiCode.java
	src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
	src/java/com/android/internal/telephony/cdma/CdmaServiceCategoryProgramHandler.java
	src/java/com/android/internal/telephony/cdma/SmsMessage.java
	src/java/com/android/internal/telephony/dataconnection/ApnContext.java
	src/java/com/android/internal/telephony/dataconnection/DcTracker.java
	src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
	src/java/com/android/internal/telephony/gsm/GSMPhone.java
	src/java/com/android/internal/telephony/gsm/GsmCellBroadcastHandler.java
	src/java/com/android/internal/telephony/gsm/GsmInboundSmsHandler.java
	src/java/com/android/internal/telephony/gsm/GsmMmiCode.java
	src/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
	src/java/com/android/internal/telephony/test/SimulatedCommands.java
	src/java/com/android/internal/telephony/uicc/IccCardProxy.java
	src/java/com/android/internal/telephony/uicc/UiccCardApplication.java
	tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java

Change-Id: I4ce305a3bd6a2857cd891a3248afc330e70a2e1b