Add AOSP support for Lynx am: cdfc6970cc am: e561357e32

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/19421015

Change-Id: I7992912c7b76a420b09013815cf2e565dccfd4d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

device-lynx.mk

@@ -21,6 +21,7 @@ $(call inherit-product-if-exists, vendor/google_devices/lynx/prebuilts/device-ve
 $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/lynx/device-vendor-lynx.mk)
+$(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/device-vendor.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/google/lynx/lynx/overlay
 

lynx/BoardConfig.mk

@@ -21,5 +21,6 @@ USES_DEVICE_GOOGLE_LYNX := true
 
 include device/google/gs201/BoardConfig-common.mk
 -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
+-include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk
 include device/google/lynx-sepolicy/lynx-sepolicy.mk
-include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk
+include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk