use svc nfc enable/disable which is always the same.

Test: run vts-hal-hidl
Change-Id: I347ff0ad92dfc39c9b97fefb8afb4d05aa883aa5
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py
index 0c34f99..ede7897 100644
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py
+++ b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py
@@ -37,8 +37,8 @@
 
         self.dut.shell.InvokeTerminal("one")
         self.dut.shell.one.Execute("setenforce 0")  # SELinux permissive mode
-        self.dut.shell.one.Execute("service call nfc 6")  # Turn off
-        time.sleep(2)
+        self.dut.shell.one.Execute("svc nfc disable")  # Turn off
+        time.sleep(5)
 
         if getattr(self, PASSTHROUGH_MODE_KEY, True):
             self.dut.shell.one.Execute(
@@ -56,7 +56,9 @@
 
     def tearDownClass(self):
         """Turns off the framework-layer NFC service."""
-        self.dut.shell.one.Execute("service call nfc 6")  # make sure it's off
+        # Ideally, we would want to store the nfc service's state before
+        # turning that off in setUpClass and restore the original state.
+        self.dut.shell.one.Execute("svc nfc disable")  # make sure it's off
 
     def testBase(self):
         """A simple test case which just calls each registered function."""