Merge "Update PermissionManager#checkPermission API based on API council feedback" into main

  public final class PermissionManager {

    method public int checkDeviceIdentifierAccess(@Nullable String, @Nullable String, @Nullable String, int, int);

    method @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") public static int checkPermission(@NonNull String, @NonNull String, @NonNull String, int);

    method @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") public int checkPermission(@NonNull String, @NonNull String, @NonNull String);

    method @RequiresPermission(value=android.Manifest.permission.UPDATE_APP_OPS_STATS, conditional=true) public int checkPermissionForDataDelivery(@NonNull String, @NonNull android.content.AttributionSource, @Nullable String);

    method @RequiresPermission(value=android.Manifest.permission.UPDATE_APP_OPS_STATS, conditional=true) public int checkPermissionForDataDeliveryFromDataSource(@NonNull String, @NonNull android.content.AttributionSource, @Nullable String);

    method public int checkPermissionForPreflight(@NonNull String, @NonNull android.content.AttributionSource);

     *

     * @param permissionName The name of the permission you are checking for.

     * @param packageName The name of the package you are checking against.

     * @param persistentDeviceId The persistent device id you are checking against.

     * @param userId The user Id associated with context.

     * @param persistentDeviceId The id of the physical device that you are checking permission

     *                           against.

     *

     * @return If the package has the permission on the device, PERMISSION_GRANTED is

     * returned.  If it does not have the permission on the device, PERMISSION_DENIED

     * is returned.

     *

     * @see VirtualDevice#getPersistentDeviceId()

     * @see PackageManager#PERMISSION_GRANTED

     * @see PackageManager#PERMISSION_DENIED

     *

     * @hide

     */

    @SystemApi

    @PermissionResult

    @FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)

    public static int checkPermission(@NonNull String permissionName, @NonNull String packageName,

            @NonNull String persistentDeviceId, @UserIdInt int userId) {

    public int checkPermission(@NonNull String permissionName, @NonNull String packageName,

            @NonNull String persistentDeviceId) {

        return sPackageNamePermissionCache.query(

                new PackageNamePermissionQuery(permissionName, packageName, persistentDeviceId,

                        userId));

                        mContext.getUserId()));

    }

    /**