Merge branch 'feature/btdm_add_set_local_icon_api' into 'master'

Component/bt: add set gap icon API

See merge request idf/esp-idf!2129

diff --cc components/bt/bluedroid/api/esp_gap_ble_api.c
Simple merge

diff --cc components/bt/bluedroid/api/include/esp_gap_ble_api.h
Simple merge

diff --cc components/bt/bluedroid/stack/btm/btm_ble_gap.c
Simple merge

diff --cc components/bt/bluedroid/stack/include/btm_ble_api.h
Simple merge