Preempt build error from merge with CL (2/2)

Merging CL: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657

Change-Id: Ic4944b27f9d39dbaccb6baa5ba6761dc4663cd02

api/current.txt

@@ -27861,6 +27861,7 @@ package android.telecomm {
   public abstract class InCallService extends android.app.Service {
     ctor protected InCallService();
     method protected abstract void addCall(android.telecomm.InCallCall);
+    method protected abstract void bringToForeground(boolean);
     method protected final android.telecomm.InCallAdapter getAdapter();
     method protected void onAdapterAttached(android.telecomm.InCallAdapter);
     method protected abstract void onAudioStateChanged(android.telecomm.CallAudioState);

telecomm/java/android/telecomm/InCallService.java

@@ -206,4 +206,11 @@ public abstract class InCallService extends Service {
      * @param audioState The new {@link CallAudioState}.
      */
     protected abstract void onAudioStateChanged(CallAudioState audioState);
+
+    /**
+     * Brings the in-call screen to the foreground.
+     *
+     * @param showDialpad If true, put up the dialpad when the screen is shown.
+     */
+    protected abstract void bringToForeground(boolean showDialpad);
 }