Correctly hide in-call panel when dialpad is shown

Cherry pick of Ia673f7c08abfdf240c792ce6a457c743f0db0b8e

Fixing issue 5497680 Device shows background Incall screen for
fraction of sec in DTMF call pad screen, if power button is turned
ON.

We're calling setInCallScreenMode(NORMAL) from onResume(), which
should take care of dialpad status correctly.

Bug: 5497680
Change-Id: Ib8346cfd5b1c98190d66603b24ceddf234754496
diff --git a/src/com/android/phone/InCallScreen.java b/src/com/android/phone/InCallScreen.java
index 54441bb..b46e770 100755
--- a/src/com/android/phone/InCallScreen.java
+++ b/src/com/android/phone/InCallScreen.java
@@ -3622,7 +3622,11 @@
                 break;
 
             case NORMAL:
-                mInCallPanel.setVisibility(View.VISIBLE);
+                if (isDialerOpened()) {
+                    mInCallPanel.setVisibility(View.GONE);
+                } else {
+                    mInCallPanel.setVisibility(View.VISIBLE);
+                }
                 mManageConferenceUtils.setPanelVisible(false);
                 mManageConferenceUtils.stopConferenceTime();
                 break;