Merge "Code cleanup: removed P2P in NfcDiscoveryParametersTest" into main