Merge tag 'android-6.0.1_r3' into m

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Fix a crash while printing ICCID because of alphabets in UICC.
  Set WIFI icon for connection based on connection extra.
  Change gid-matching process
  Save call forwarding flag in SharedPreference.
  Ensure connection extras set before connection start are passed through.
  Fix data connection issues introduced in a7228870
  Revert "Revert "Fix HD icon shown for MO VoLTE call when it shouldn't""
  Revert "Fix HD icon shown for MO VoLTE call when it shouldn't"
  DO NOT MERGE Add delay between postdial DTMF tones for CDMA.
  Mask IccId which gets printed in bug reports & radio logs.
  Hide IccId from SubscriptionController logs.
  Fix handling for no default phone.
  IMS: Fix ArrayIndexOutOfBoundsException
  Fix handling of connect req while connected.
  Get display manager state after registering with DisplayManager
  Fix use of memorized phoneId.
  Change to add user_visible field to Carriers table.

Conflicts:
	src/java/com/android/internal/telephony/PhoneBase.java
	src/java/com/android/internal/telephony/dataconnection/DcSwitchAsyncChannel.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/gsm/GsmMmiCode.java
	src/java/com/android/internal/telephony/imsphone/ImsPhone.java
	src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java

Change-Id: If877ad3a8c812f987cad38e65f94047fb14a9629