Merge changes I5edfdc98,I42b87bf9 into android10-tests-dev

* changes:
  hostapd(vts): Use the correct syntax for vendor prop
  hostapd(vts): Add a property for SAP interface