Merge "Merge "add missing annotation for CarrierIdentifier" am: fd46a0aa am:...

  public class CarrierIdentifier implements android.os.Parcelable {

    ctor public CarrierIdentifier(String, String, @Nullable String, @Nullable String, @Nullable String, @Nullable String);

    ctor public CarrierIdentifier(String, String, @Nullable String, @Nullable String, @Nullable String, @Nullable String, int, int);

    ctor public CarrierIdentifier(@NonNull String, @NonNull String, @Nullable String, @Nullable String, @Nullable String, @Nullable String, int, int);

    ctor public CarrierIdentifier(byte[], @Nullable String, @Nullable String);

    method public int describeContents();

    method public int getCarrierId();

package android.service.carrier;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.os.Parcel;

import android.os.Parcelable;

     * @param preciseCarrierId precise carrier identifier

     * {@link TelephonyManager#getSimPreciseCarrierId()}

     */

    public CarrierIdentifier(String mcc, String mnc, @Nullable String spn,

    public CarrierIdentifier(@NonNull String mcc, @NonNull String mnc, @Nullable String spn,

                             @Nullable String imsi, @Nullable String gid1, @Nullable String gid2,

                             int carrierid, int preciseCarrierId) {

        mMcc = mcc;