Merge "Add config changes for NFC Antenna Location" am: 77691799f5

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/2258124

Change-Id: Icf4e8b7227cb451b7b8f3c2e43ead4e4e9e55792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>