Merge "Default libnfc-nci.conf for GSI" am: 0f7506c92d
am: 4d2156251f

Change-Id: I161e0c90de8bd325a8fe7afbd91cd8acac113016