Merge a1c1a91dafed986e057e89cd37c64c2bb0ba37fa on remote branch

Change-Id: I1980da9c62db89736d1ea3dd5892e8a29f09d528
diff --git a/java/com/android/incallui/BottomSheetHelper.java b/java/com/android/incallui/BottomSheetHelper.java
index 30949bc..44e99cd 100644
--- a/java/com/android/incallui/BottomSheetHelper.java
+++ b/java/com/android/incallui/BottomSheetHelper.java
@@ -668,7 +668,7 @@
        return;
      }
      //For Consultative transfer number is not needed
-     DialerCall backgroundCall = CallList.getInstance().getBackgroundCall();
+     DialerCall backgroundCall = InCallPresenter.getInstance().getSecondaryCall();
      if (backgroundCall == null ||
          !Objects.equals(backgroundCall.getAccountHandle(), mCall.getAccountHandle())) {
        LogUtil.w("BottomSheetHelper.transferCallConsultative", "backgroundCall is null" +