Merge "Revert "Revert "svc(nfc): Use NfcAdapter API to enable/disable""" into main am: 1d98705039

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

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