Merge "Revert^3 "Use -target-feature for MTE"" into main am: 2e14f9acc8

Original change: https://android-review.googlesource.com/c/platform/build/+/3299864

Change-Id: I500a7014e8c03b1abe3d4b930eaf88069ab1bdb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index c14fa17..06fccb6 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -581,6 +581,7 @@
                 "ContactsProvider", // base_system
                 "CredentialManager", // handheld_system
                 "DeviceAsWebcam", // handheld_system
+                "DeviceDiagnostics", // handheld_system - internal
                 "DocumentsUI", // handheld_system
                 "DownloadProvider", // base_system
                 "DownloadProviderUi", // handheld_system