Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev