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

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

Change-Id: I99b5015c93c12824ee66c648247ba916e772256d