Merge branch 'bugfix/phy_change_for_WiFi_scan_BLE_scan_watchdog' into 'master'

phy change for WiFi scan BLE scan watchdog

Closes WIFI-681

See merge request espressif/esp-idf!5539
This commit is contained in:
Jiang Jiang Jian
2019-07-18 17:31:00 +08:00