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

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