Merge "Revert "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 8923ca1..8a21174 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -578,7 +578,6 @@
"ContactsProvider", // base_system
"CredentialManager", // handheld_system
"DeviceAsWebcam", // handheld_system
- "DeviceDiagnostics", // handheld_system - internal
"DocumentsUI", // handheld_system
"DownloadProvider", // base_system
"DownloadProviderUi", // handheld_system