Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26': (71 commits)
  No notifications for disconnected unknown calls.
  Make DcTracker RetryFailures.ONLY_ON_CHANGE work.
  Add forground flag for retry intent to avoid long delayed cellular data setup.
  roamingProtocol should be used for roaming.
  Fix automatic network selection mode issue
  Fix connect during retry.
  Register for intent CARRIER_CONFIG_CHANGED when PhoneProxy is created
  Fix HD icon shown for MO VoLTE call when it shouldn't
  Don't allow the apn to decrement below 0.
  Allow non-persistent manual network selection.
  Allow non-persistent manual network selection.
  Fix useImsForUt check
  Fix useImsForUt check
  Fix race in dafault phone creation
  Fix race in dafault phone creation
  Fix other Disconnect msg senders
  Fix other Disconnect msg senders
  Ignore phone switching while shutting down.
  Let some messages get processed in emergency state
  Fixed the incorrect signal strength info displayed after call end.
  ...

Conflicts:
	src/java/com/android/internal/telephony/PhoneBase.java
	src/java/com/android/internal/telephony/PhoneFactory.java
	src/java/com/android/internal/telephony/PhoneProxy.java
	src/java/com/android/internal/telephony/ServiceStateTracker.java
	src/java/com/android/internal/telephony/cat/CatCmdMessage.java
	src/java/com/android/internal/telephony/cat/CatService.java
	src/java/com/android/internal/telephony/cat/CommandParams.java
	src/java/com/android/internal/telephony/cat/CommandParamsFactory.java
	src/java/com/android/internal/telephony/cdma/CDMAPhone.java
	src/java/com/android/internal/telephony/dataconnection/ApnContext.java
	src/java/com/android/internal/telephony/dataconnection/DcSwitchAsyncChannel.java
	src/java/com/android/internal/telephony/dataconnection/DcSwitchStateMachine.java
	src/java/com/android/internal/telephony/dataconnection/DcTracker.java
	src/java/com/android/internal/telephony/dataconnection/DctController.java
	src/java/com/android/internal/telephony/gsm/GSMPhone.java
	src/java/com/android/internal/telephony/imsphone/ImsPhone.java
	src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
	src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java

Change-Id: I68a1efbefb938bc7cff6cbe251008f3001e100e8