Merge "Expose VPN_UID"

    method public default int getStability();

  }

  public class Process {

    field public static final int VPN_UID = 1016; // 0x3f8

  }

  public class StatsServiceManager {

    method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsCompanionServiceRegisterer();

    method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsManagerServiceRegisterer();

package android.os;

import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.system.ErrnoException;

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int VPN_UID = 1016;

    /**