diff --git a/packages/PackageInstaller/Android.bp b/packages/PackageInstaller/Android.bp
index 98a5a67..b646da4 100644
--- a/packages/PackageInstaller/Android.bp
+++ b/packages/PackageInstaller/Android.bp
@@ -59,69 +59,5 @@
     lint: {
         error_checks: ["Recycle"],
     },
-}
-
-android_app {
-    name: "PackageInstaller_tablet",
-    defaults: ["platform_app_defaults"],
-
-    srcs: [
-        "src/**/*.java",
-        "src/**/*.kt",
-    ],
-
-    certificate: "platform",
-    privileged: true,
-    platform_apis: false,
-    sdk_version: "system_current",
-    rename_resources_package: false,
-    overrides: ["PackageInstaller"],
-
-    static_libs: [
-        "xz-java",
-        "androidx.leanback_leanback",
-        "androidx.fragment_fragment",
-        "androidx.lifecycle_lifecycle-livedata",
-        "androidx.lifecycle_lifecycle-extensions",
-        "android.content.pm.flags-aconfig-java",
-        "android.os.flags-aconfig-java",
-    ],
-    aaptflags: ["--product tablet"],
-
-    lint: {
-        error_checks: ["Recycle"],
-    },
-}
-
-android_app {
-    name: "PackageInstaller_tv",
-    defaults: ["platform_app_defaults"],
-
-    srcs: [
-        "src/**/*.java",
-        "src/**/*.kt",
-    ],
-
-    certificate: "platform",
-    privileged: true,
-    platform_apis: false,
-    sdk_version: "system_current",
-    rename_resources_package: false,
-    overrides: ["PackageInstaller"],
-
-    static_libs: [
-        "xz-java",
-        "androidx.leanback_leanback",
-        "androidx.annotation_annotation",
-        "androidx.fragment_fragment",
-        "androidx.lifecycle_lifecycle-livedata",
-        "androidx.lifecycle_lifecycle-extensions",
-        "android.content.pm.flags-aconfig-java",
-        "android.os.flags-aconfig-java",
-    ],
-    aaptflags: ["--product tv"],
-
-    lint: {
-        error_checks: ["Recycle"],
-    },
+    generate_product_characteristics_rro: true,
 }