Merge "Test : Fixing test case failure for NfcCardEmulationOccurredTest-testHCEOther" into main