merge in master-release history after reset to master
diff --git a/overlay/packages/apps/Nfc/res/values/provisioning.xml b/overlay/packages/apps/Nfc/res/values/provisioning.xml
index 1ca59e3..c996eb5 100644
--- a/overlay/packages/apps/Nfc/res/values/provisioning.xml
+++ b/overlay/packages/apps/Nfc/res/values/provisioning.xml
@@ -17,12 +17,10 @@
 <!-- NFC resources that may need to be customized
      for different hardware or product builds. -->
 <resources>
-    <!-- Whether the device can receive NFC data in setup wizard -->
-    <bool name="enable_nfc_provisioning">true</bool>
-
     <!-- The accepted mime-types when NFC is enabled in setup wizard.
          Mime-types must be lower case, wildcards are *not* accepted. -->
     <string-array name="provisioning_mime_types">
         <item>application/vnd.com.google.android.nfcprovision</item>
+        <item>application/com.android.managedprovisioning</item>
     </string-array>
 </resources>