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

* commit '61520b2ef9c766a75bced02b4cc65dc66414d234':
  WifiP2pWfdInfo set device type bugfix