Merge "Fix TelephonyTest for IPackageManager isolation" into tm-dev

import android.content.Intent;

import android.content.SharedPreferences;

import android.content.pm.ApplicationInfo;

import android.content.pm.IPackageManager;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.location.LocationManager;

import com.android.internal.telephony.uicc.UiccPort;

import com.android.internal.telephony.uicc.UiccProfile;

import com.android.internal.telephony.uicc.UiccSlot;

import com.android.server.pm.PackageManagerService;

import com.android.server.pm.permission.LegacyPermissionManagerService;

import org.mockito.Mockito;

    protected ImsEcbm mImsEcbm;

    protected SubscriptionController mSubscriptionController;

    protected ServiceState mServiceState;

    protected PackageManagerService mMockPackageManager;

    protected IPackageManager.Stub mMockPackageManager;

    protected LegacyPermissionManagerService mMockLegacyPermissionManager;

    protected SimulatedCommandsVerifier mSimulatedCommandsVerifier;

    protected InboundSmsHandler mInboundSmsHandler;

        mImsEcbm = Mockito.mock(ImsEcbm.class);

        mSubscriptionController = Mockito.mock(SubscriptionController.class);

        mServiceState = Mockito.mock(ServiceState.class);

        mMockPackageManager = Mockito.mock(PackageManagerService.class);

        mMockPackageManager = Mockito.mock(IPackageManager.Stub.class);

        mMockLegacyPermissionManager = Mockito.mock(LegacyPermissionManagerService.class);

        mSimulatedCommandsVerifier = Mockito.mock(SimulatedCommandsVerifier.class);

        mInboundSmsHandler = Mockito.mock(InboundSmsHandler.class);