Merge commit '86dd3d2269bc264138cc314b349864dfd8cb115a' into remote
Conflicts:
src/java/android/telephony/SmsManager.java
src/java/com/android/internal/telephony/BaseCommands.java
src/java/com/android/internal/telephony/CommandsInterface.java
src/java/com/android/internal/telephony/GsmCdmaCallTracker.java
src/java/com/android/internal/telephony/GsmCdmaConnection.java
src/java/com/android/internal/telephony/GsmCdmaPhone.java
src/java/com/android/internal/telephony/IccProvider.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/PhoneInternalInterface.java
src/java/com/android/internal/telephony/RIL.java
src/java/com/android/internal/telephony/ServiceStateTracker.java
src/java/com/android/internal/telephony/TelephonyEventLog.java
src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
src/java/com/android/internal/telephony/dataconnection/DcTracker.java
src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java
src/java/com/android/internal/telephony/test/SimulatedCommandsVerifier.java
src/java/com/android/internal/telephony/uicc/AdnRecord.java
src/java/com/android/internal/telephony/uicc/UiccController.java
tests/telephonytests/src/com/android/internal/telephony/GsmCdmaCallTrackerTest.java
tests/telephonytests/src/com/android/internal/telephony/ImsSMSDispatcherTest.java
tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java
tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
Change-Id: I353ccef1d324716b13196ff6b3a56a74e091de51