bluetooth: stop bthelper service after start up

The recently released pi-bluetooth <0.1.17> updated the service file
to have the bthelper remain active after execution. An active bthelper
will interference with bluetoothd to cause a newly reset Pi not auto
discoverable. Proactively removing the bthelper service file to have it
not start with Bluetooth.

BUG=b:190534015
TEST=bluetooth_AdapterAUHealth

Change-Id: Ic21c0b84f23ab8491b8d5b2c8065498c0b9d91cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/chameleon/+/2947603
Reviewed-by: Shyh-In Hwang <josephsih@chromium.org>
Commit-Queue: Michael Sun <michaelfsun@google.com>
Tested-by: Michael Sun <michaelfsun@google.com>
diff --git a/deploy/deploy b/deploy/deploy
index 6f4c452..0442c36 100755
--- a/deploy/deploy
+++ b/deploy/deploy
@@ -332,6 +332,7 @@
     # Update bluetooth rules in service config files
     BT_ADMIN_CONF="/etc/systemd/system/bluetooth.target.wants/bluetooth.service"
     BT_SRC_CONF="/lib/systemd/system/bluetooth.service"
+    BT_HELPER_CONF="/lib/systemd/system/bthelper@.service"
     EXEC_START="ExecStart"
     EXEC_OPTS="-d -P input"
 
@@ -349,6 +350,11 @@
         eval "service bluetooth restart"
     fi
 
+    # Make sure the bthelper tool will not interact with bluetoothd
+    if [ -f "$BT_HELPER_CONF" ]; then
+        rm -f "${BT_HELPER_CONF}"
+    fi
+
     # Create new dbus service conf if it doesn't exist
     DEST_KBD_CONF="/etc/dbus-1/system.d/org.chromium.autotest.btkbservice.conf"
     if [ ! -e DEST_KBD_CONF ]; then