Merge "Serialize scan/p2p-scan if already scheduled on the same interface" into wlan-aosp-service.lnx.2.0-dev