Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4 am: dffb22be1e am: df039120bc am: e4098f4648 am: 4efaa94371

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

Change-Id: Id85a3efe6649d80c477499b6f54a29058806ff68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk
index 6c93dd7..d5c2a87 100644
--- a/target/product/handheld_system.mk
+++ b/target/product/handheld_system.mk
@@ -44,6 +44,7 @@
     CaptivePortalLogin \
     CertInstaller \
     CredentialManager \
+    DeviceAsWebcam \
     DocumentsUI \
     DownloadProviderUi \
     EasterEgg \