Merge branch 'bugfix/fix_the_watchdog_during_WiFi_scan_BLE_scan' into 'master'

fix the watchdog bug during WiFi scan and BLE scan

See merge request espressif/esp-idf!5521
This commit is contained in:
Jiang Jiang Jian
2019-07-14 14:40:33 +08:00