Merge "Revert "wfd: release wifi p2p resource on disconnecting from WFD service."" into sc-dev