[automerger skipped] Merge "Use default libnfc-nci.conf if not found in vendor/etc" into pi-dev
am: 1ba5f6745a  -s ours

Change-Id: Ibbdbf560909f5624e559f26ccd988aa91d933b93