Merge "svc(nfc): Use NfcAdapter API to enable/disable" into main am: 6285b21624

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798234

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