Merge "Make getIEuiccContronller() protected and non-static for CTS."

import android.annotation.Nullable;

import android.annotation.SdkConstant;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.app.Activity;

import android.app.PendingIntent;

import android.content.Context;

        }

    }

    private static IEuiccController getIEuiccController() {

    /**

     * @hide

     */

    @TestApi

    protected IEuiccController getIEuiccController() {

        return IEuiccController.Stub.asInterface(ServiceManager.getService("econtroller"));

    }

}