Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev am: d8916ef151
am: 3454468111

Change-Id: Ic192e361b65b758d7e143d3b995ca86e30b3256d