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

Change-Id: I31f6e7d74604debe70b1f83ce4436c9e284c4307