Merge "Make AOSP NFC provisioning always use DO like in pre-T"