Merge changes from topic "safe-vf"

* changes:
  Stops using VNDK-current on vendor for vendor-freeze system builds.
  Introduce aosp_redfin_vf product.

AndroidProducts.mk

@@ -16,6 +16,8 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_redfin.mk \
+    $(LOCAL_DIR)/aosp_redfin_vf.mk \
 
 COMMON_LUNCH_CHOICES := \
     aosp_redfin-userdebug \
+    aosp_redfin_vf-userdebug \

aosp_redfin.mk

@@ -49,11 +49,13 @@ $(call inherit-product-if-exists, vendor/google_devices/redfin/prebuilts/device-
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/aosp_excluded_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/aosp_excluded_hardware.xml
 
-# Keep the VNDK APEX in /system partition for REL branches as these branches are
+# Keep the VNDK APEX in /system partition for REL branches and Vendor Freeze targets
-# expected to have stable API/ABI surfaces.
+# as these are expected to have stable API/ABI surfaces.
 ifneq (REL,$(PLATFORM_VERSION_CODENAME))
+ifneq ($(PRODUCT_VENDOR_FREEZE_SYSTEM_BUILD),true)
   PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
 endif
+endif
 
 # Don't build super.img.
 PRODUCT_BUILD_SUPER_PARTITION := false

aosp_redfin_vf.mk

@@ -0,0 +1,34 @@
+#
+# Copyright 2020 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Makefile for the system-only partial build of aosp_redfin.
+# Used for creating a merged Vendor Freeze device.
+
+PRODUCT_VENDOR_FREEZE_SYSTEM_BUILD := true
+
+# Include VNDK v30, needed by the Android 11 vendor half.
+PRODUCT_EXTRA_VNDK_VERSIONS = 30
+
+# Disable building certain non-system partitions in this build.
+PRODUCT_BUILD_BOOT_IMAGE := false
+PRODUCT_BUILD_RECOVERY_IMAGE := false
+PRODUCT_BUILD_VBMETA_IMAGE := false
+PRODUCT_BUILD_VENDOR_IMAGE := false
+PRODUCT_BUILD_VENDOR_BOOT_IMAGE := false
+
+$(call inherit-product, device/google/redfin/aosp_redfin.mk)
+
+PRODUCT_NAME := aosp_redfin_vf