Merge "wfd: add cts tests for new WifiP2pWfdInfo APIs" into sc-dev