Merge "Revert "Adding INfcUnlockSettings and NfcUnlock interface class.""