Merge "wifi-display: add drop down list for Wps config method" into klp-dev