Merge "P2P: Clear P2P_DEV_SD_INFO when new wildcard SD query is added"