Merge "Expose BarringInfo#getCellIdentity as a SystemApi" into main

  public final class BarringInfo implements android.os.Parcelable {

    ctor public BarringInfo();

    method @NonNull public android.telephony.BarringInfo createLocationInfoSanitizedCopy();

    method @FlaggedApi("com.android.internal.telephony.flags.cell_identity_for_barring_info") @Nullable public android.telephony.CellIdentity getCellIdentity();

  }

  @Deprecated public final class CallAttributes implements android.os.Parcelable {

package android.telephony;

import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.os.Parcelable;

import android.util.SparseArray;

import com.android.internal.telephony.flags.Flags;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.Objects;

     *

     * @hide

     */

    public CellIdentity getCellIdentity() {

    @SystemApi

    @FlaggedApi(Flags.FLAG_CELL_IDENTITY_FOR_BARRING_INFO)

    public @Nullable CellIdentity getCellIdentity() {

        return mCellIdentity;

    }