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

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



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