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

Merge "Merge "svc(nfc): Use NfcAdapter API to enable/disable" into main am: 6285b216 am: 0405c4f5" into udc-qpr-dev-plus-aosp am: 82afe628

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



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