Merge "Revert "Revert "svc(nfc): Use NfcAdapter API to enable/disable""" into...

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

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



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