Merge "Remove more instances of guava optional for built in optional."

import com.android.incallui.video.protocol.VideoCallScreen;

import com.android.incallui.video.protocol.VideoCallScreenDelegate;

import com.android.incallui.video.protocol.VideoCallScreenDelegateFactory;

import com.google.common.base.Optional;

import com.google.common.util.concurrent.ListenableFuture;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.List;

import java.util.Optional;

/** Version of {@link InCallActivity} that shows the new UI */

public class InCallActivity extends TransactionSafeFragmentActivity

  private static final int DIALPAD_REQUEST_SHOW = 2;

  private static final int DIALPAD_REQUEST_HIDE = 3;

  private static Optional<Integer> audioRouteForTesting = Optional.absent();

  private static Optional<Integer> audioRouteForTesting = Optional.empty();

  private SelectPhoneAccountListener selectPhoneAccountListener;

  private UiListener<Result> preferredAccountWorkerResultListener;

import android.support.annotation.NonNull;

import android.support.v4.app.Fragment;

import com.android.incallui.call.DialerCall;

import com.google.common.base.Optional;

import com.google.common.util.concurrent.ListenableFuture;

import java.util.Optional;

/** Provides operations necessary to SpeakEasy. */

public interface SpeakEasyCallManager {

import android.support.annotation.Nullable;

import android.support.v4.app.Fragment;

import com.android.incallui.call.DialerCall;

import com.google.common.base.Optional;

import com.google.common.util.concurrent.Futures;

import com.google.common.util.concurrent.ListenableFuture;

import java.util.Optional;

import javax.inject.Inject;

/** Default implementation of SpeakEasyCallManager. */

  @Override

  @Nullable

  public Optional<Fragment> getSpeakEasyFragment(DialerCall call) {

    return Optional.absent();

    return Optional.empty();

  }

  /** Always inert in the stub. */