Merge "nfc(api): Separate out NfcExtras from nfc APIs" into main