diff --git a/core/java/com/android/internal/util/crdroid/PixelPropsUtils.java b/core/java/com/android/internal/util/crdroid/PixelPropsUtils.java
index 59beba09fcd62..95c7e5fe77da9 100644
--- a/core/java/com/android/internal/util/crdroid/PixelPropsUtils.java
+++ b/core/java/com/android/internal/util/crdroid/PixelPropsUtils.java
@@ -31,13 +31,17 @@ public class PixelPropsUtils {
     private static final boolean DEBUG = false;
 
     private static final Map<String, Object> propsToChange;
+    private static final Map<String, Object> propsToChangePixel3;
 
     private static final String[] packagesToChange = {
         "com.google.android.apps.safetyhub",
         "com.google.android.apps.turbo",
         "com.google.android.apps.wallpaper",
         "com.google.android.apps.maps",
-        "com.google.android.gms",
+        "com.google.android.gms"
+    };
+
+    private static final String[] packagesToChangePixel3 = {
         "com.google.android.googlequicksearchbox"
     };
 
@@ -49,6 +53,8 @@ public class PixelPropsUtils {
         propsToChange.put("PRODUCT", "redfin");
         propsToChange.put("MODEL", "Pixel 5");
         propsToChange.put("FINGERPRINT", "google/redfin/redfin:11/RQ2A.210305.007/7124944:user/release-keys");
+        propsToChangePixel3 = new HashMap<>();
+        propsToChangePixel3.put("MODEL", "Pixel 3 XL");
     }
 
     public static void setProps(String packageName) {
@@ -65,6 +71,16 @@ public static void setProps(String packageName) {
                 setPropValue(key, value);
             }
         }
+        if (Arrays.asList(packagesToChangePixel3).contains(packageName)) {
+            if (DEBUG) {
+                Log.d(TAG, "Defining props for: " + packageName);
+            }
+            for (Map.Entry<String, Object> prop : propsToChangePixel3.entrySet()) {
+                String key = prop.getKey();
+                Object value = prop.getValue();
+                setPropValue(key, value);
+            }
+        }
         // Set proper indexing fingerprint
         if (packageName.equals("com.google.android.settings.intelligence")) {
             setPropValue("FINGERPRINT", Build.DATE);