Merge "WifiP2pWfdInfo: Only pass the wfd info to WifiNative" into oc-dev
am: 26ff5a67ee

Change-Id: I73ea001fb5deab02beb2d7c1ffc1d4330e8929a8