Merge changes from topic "ims_cc" am: a08cc830 am: 9d0769f8 am: b235b87f

package android.telephony.ims.aidl;

import android.os.PersistableBundle;

import android.telephony.ims.aidl.IImsConfigCallback;

import com.android.ims.ImsConfigListener;

    int setConfigInt(int item, int value);

    // Return result code defined in ImsConfig#OperationStatusConstants

    int setConfigString(int item, String value);

    void updateImsCarrierConfigs(in PersistableBundle bundle);

}

import android.annotation.IntDef;

import android.annotation.SystemApi;

import android.content.Context;

import android.os.PersistableBundle;

import android.os.RemoteCallbackList;

import android.os.RemoteException;

import android.telephony.ims.aidl.IImsConfig;

            return retVal;

        }

        @Override

        public void updateImsCarrierConfigs(PersistableBundle bundle) throws RemoteException {

            getImsConfigImpl().updateImsCarrierConfigs(bundle);

        }

        private ImsConfigImplBase getImsConfigImpl() throws RemoteException {

            ImsConfigImplBase ref = mImsConfigImplBaseWeakReference.get();

            if (ref == null) {

        // Base Implementation - To be overridden.

        return null;

    }

    /**

     * @hide

     */

    public void updateImsCarrierConfigs(PersistableBundle bundle) {

        // Base Implementation - Should be overridden

    }

}