Merge branch 'bugfix/btdm_controller_disable_v3.1' into 'release/v3.1'

Fix two bugs when disable bluetooth controller(backport v3.1)

See merge request idf/esp-idf!3693
This commit is contained in:
Jiang Jiang Jian
2018-11-20 17:00:38 +08:00