Merge "Revert "wfd: release wifi p2p resource on disconnecting from WFD...

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15008435

Change-Id: If2c45556c6aa0b9349ce3d2607407a3a714c45e1