Merge "hostapd(vts): Use the correct syntax for vendor prop am: 4335de4cac am: 39502371dd" into qt-r1-dev-plus-aosp