Merge "CTS test for WiFi watchdog - framework support." into jb-mr1-dev