Merge "Revert "svc(nfc): Use NfcAdapter API to enable/disable"" into main am: 47be3bb627 am: 8b0f90257a am: 714286d19a

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

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