Merge "Nfc AIdl interface updated following" into main