Merge "Revert "Add sepolicy for persist.nfc""