am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"

* commit '085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd':
  WifiP2pWfdInfo set device type bugfix

wifi/java/android/net/wifi/p2p/WifiP2pWfdInfo.java

@@ -77,6 +77,7 @@ public class WifiP2pWfdInfo implements Parcelable {
 
     public boolean setDeviceType(int deviceType) {
         if (deviceType >= WFD_SOURCE && deviceType <= SOURCE_OR_PRIMARY_SINK) {
+            mDeviceInfo &= ~DEVICE_TYPE;
             mDeviceInfo |= deviceType;
             return true;
         }