Merge "Revert "svc(nfc): Use NfcAdapter API to enable/disable"" into main am: 47be3bb627 am: 3162241e10 am: 99b118f298

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

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