Merge "Default libnfc-nci.conf for GSI"