Merge "Clean up device/generic/common/nfc/libnfc-nci.conf usages" am: 724dd47c7b am: 9a70eefde0

Original change: https://android-review.googlesource.com/c/device/generic/common/+/1347083

Change-Id: I3652d6615edc687e99f2554f8286e7d91388e979