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

* commit '400ec1b938ddc8da367c594105bfaa7485c80564':
  WifiP2pWfdInfo set device type bugfix