Merge "GD Rust: Instantiate Controller for HCI Cert tests" am: d58e7d78

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2018601

Change-Id: Ibea2d915b22568f78461e572cb49ab4641c2277c

system/gd/rust/facade/src/lib.rs

@@ -80,10 +80,7 @@ impl FacadeServer {
             BluetoothModule::HAL => {
                 services.push(stack.get_grpc::<HciHalFacadeService>().await);
             }
-            BluetoothModule::HCI => {
-                services.push(stack.get_grpc::<HciFacadeService>().await);
-            }
-            BluetoothModule::HCI_INTERFACES => {
+            BluetoothModule::HCI | BluetoothModule::HCI_INTERFACES => {
                 services.push(stack.get_grpc::<HciFacadeService>().await);
                 services.push(stack.get_grpc::<ControllerFacadeService>().await);
             }