[build/android] Ensure NFC remains disabled

build/android/provision_devices.py

Index: build/android/provision_devices.py
diff --git a/build/android/provision_devices.py b/build/android/provision_devices.py
index 27c81cd12de4246f6420a8a1e02280866e017669..d079edeeb5cfcf86964c8c1daf2a6a4411477d56 100755
--- a/build/android/provision_devices.py
+++ b/build/android/provision_devices.py
@@ -288,6 +288,10 @@ def SetProperties(device, options):
   if options.disable_network:
     device_settings.ConfigureContentSettings(
         device, device_settings.NETWORK_DISABLED_SETTINGS)
+    if device.build_version_sdk >= version_codes.MARSHMALLOW:
+      # Ensure that NFC is also switched off.
+      device.RunShellCommand(['svc', 'nfc', 'disable'],
+                             as_root=True, check_return=True)
 
   if options.disable_system_chrome:
     # The system chrome version on the device interferes with some tests.