Merge "hostapd(vts): Use the correct syntax for vendor prop am: 4335de4cac am: 583ea72d3e am: ca9b6951ef" into qt-qpr1-dev-plus-aosp