Merge "Revert^2 "Add missing modules to the internal system image"" into main
diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index 8a21174..8923ca1 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -578,6 +578,7 @@
                 "ContactsProvider", // base_system
                 "CredentialManager", // handheld_system
                 "DeviceAsWebcam", // handheld_system
+                "DeviceDiagnostics", // handheld_system - internal
                 "DocumentsUI", // handheld_system
                 "DownloadProvider", // base_system
                 "DownloadProviderUi", // handheld_system