Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1.05.00.02.066.045' into HEAD

AU_LINUX_ANDROID_LA.BF64.1.2.1.05.00.02.066.045 based on quic/aosp/LA.BF64.1.2.1

* tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1.05.00.02.066.045':
  MSIM: Fix subscription activation after SIM refresh.
  IMS: Call forwarding icon should show after enable it.
  IMS: Ims Registration error codes support
  Fix to set CDMA roaming state.
  IMS: CLIR support on IMS
  Fix to return phoneId when sim is absent
  IMS: Propagate the call session handover info to the UI

Conflicts:
	src/java/com/android/internal/telephony/PhoneBase.java
	src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java
	src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

Change-Id: I7b15fb9c9c0a4a356cac20f485ea22c168e91011