Merge "[Wifi-Aware]- Pairing related interface changes." into main