Merge "Code cleanup: removed support of P2P in NfcDiscoveryParameters" into main