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