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