Revert^2 "Reland: Switch to CF sensor sub-HAL"

76ec60451936851ab1d9d53e1028f2c0e91531da

Change-Id: I5d4ef9405edd27bf860f4b847339eb5a40abd7c0

shared/sensors/device_vendor.mk

diff --git a/shared/sensors/device_vendor.mk b/shared/sensors/device_vendor.mk
index eedfcfd..9e69d2c 100644
--- a/shared/sensors/device_vendor.mk
+++ b/shared/sensors/device_vendor.mk
@@ -33,7 +33,11 @@
 # Should check if the default feature list is okay with the implementation. Otherwise, it should set
 # LOCAL_SENSOR_FILE_OVERRIDES and copy feature files.
 ifeq ($(LOCAL_SENSOR_PRODUCT_PACKAGE),)
-       LOCAL_SENSOR_PRODUCT_PACKAGE := com.android.hardware.sensors
+    LOCAL_SENSOR_PRODUCT_PACKAGE := \
+        android.hardware.sensors-service.multihal \
+        android.hardware.sensors@2.1-impl.cuttlefish
+    PRODUCT_COPY_FILES += \
+        device/google/cuttlefish/shared/sensors/multihal/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf
 endif
 PRODUCT_PACKAGES += \
     $(LOCAL_SENSOR_PRODUCT_PACKAGE)