google_pixel: Override Pixel AiAi

* Stuff is kinda broken.

Change-Id: Ic55b2fc28303cdc3afc50d72285c77bc6c7a493a

apps/Android.mk

@@ -20,7 +20,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_DEX_PREOPT := false
-LOCAL_OVERRIDES_PACKAGES := DevicePersonalizationPrebuiltPixel2 DevicePersonalizationPrebuiltPixel3 DevicePersonalizationPrebuiltPixel4 DevicePersonalizationPrebuiltPixel2020
+LOCAL_OVERRIDES_PACKAGES := DevicePersonalizationPrebuiltPixel2 DevicePersonalizationPrebuiltPixel3 DevicePersonalizationPrebuiltPixel4 DevicePersonalizationPrebuiltPixel2020 DeviceIntelligenceNetworkPrebuilt
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_SRC_FILES := apks/$(LOCAL_MODULE).apk
 LOCAL_PRODUCT_MODULE := true

apps/GoogleApps.mk

@@ -26,7 +26,6 @@ PRODUCT_PACKAGES += \
 endif
 
 ## Only build DevicePersonalizationServices on non-Pixels
-ifeq ($(filter $(PIXEL_CODENAMES),$(TARGET_PRODUCT)),)
 PRODUCT_PACKAGES += \
     DeviceIntelligenceNetworkPrebuilt2021 \
     DevicePersonalizationPrebuiltPixel2021
@@ -34,7 +33,6 @@ PRODUCT_PACKAGES += \
 # AiAi Allowlist
 PRODUCT_COPY_FILES += \
     vendor/google_pixel/apps/sysconfig/aiai_allowlist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/aiai_allowlist.xml
-endif
 
 ## Core packages
 PRODUCT_PACKAGES += \