Merge "Add AIDL methods to override carrier package" into udc-dev

    void setCarrierTestOverride(int subId, String mccmnc, String imsi, String iccid, String gid1,

    void setCarrierTestOverride(int subId, String mccmnc, String imsi, String iccid, String gid1,

            String gid2, String plmn, String spn, String carrierPrivilegeRules, String apn);

            String gid2, String plmn, String spn, String carrierPrivilegeRules, String apn);

    /**

     * Forcibly sets a package as a carrier provisioning package.

     *

     * This override is ephemeral, and will disappear upon phone process restart (including

     * device reboot).

     *

     * WARNING: This API is meant for testing purposes only. This enables automated testing for

     * cases where the carrier service package is used as a permissioning gate for features such as

     * restricted carrier network access (restricted APNs and Merged Carrier Wifi)

     *

     * @param carrierServicePackage The package that should be marked as the carrier service

     *     package, or {@code null} to disable the override.

     */

    void setCarrierServicePackageOverride(int subId, String carrierServicePackage,

                String callingPackage);

    /**

    /**

     * A test API to return installed carrier id list version.

     * A test API to return installed carrier id list version.

     */

     */