Merge "nfc(api): Add formal APIs for new ApduServiceInfo params" into main