Merge "wfd: release wifi p2p resource on disconnecting from WFD service." into sc-dev am: 492a8e6cfe am: 561a91c85a am: 1e9df35422

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

Change-Id: Ibac33329cde26d8bd276ab2643ff5db55e1d984a

services/core/java/com/android/server/display/WifiDisplayController.java

@@ -550,6 +550,11 @@ final class WifiDisplayController implements DumpUtils.Dump {
 
     private void disconnect() {
         mDesiredDevice = null;
+        mWifiP2pManager = null;
+        if (null != mWifiP2pChannel) {
+            mWifiP2pChannel.close();
+            mWifiP2pChannel = null;
+        }
         updateConnection();
     }