am 3a0acc03: am 381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."

# By Yoshihiko Ikenaga
# Via Android Git Automerger (1) and others
* commit '3a0acc03bb0f57df23b2c8e859acd37b80f42620':
  Fix WPS configuration method of BSS enrollee.