component/bt: Merge the new master to avoid conflict.

diff --cc components/bt/bluedroid/api/include/esp_bt_defs.h
index 9e9ee904ade02387d08718e5a82c1c7bee345968,97f76fd05a21b292445d3092b28dd00eea43888c..87d4b78378b548b74e1db975add4c4992f9b010c
--- 1/components/bt/bluedroid/api/include/esp_bt_defs.h
--- 2/components/bt/bluedroid/api/include/esp_bt_defs.h
+++ b/components/bt/bluedroid/api/include/esp_bt_defs.h
@@@ -22,15 -22,21 +22,22 @@@
  extern "C" {
  #endif
  
+ /* relate to BT_STATUS_xxx in bt_def.h */
  /// Status Return Value
  typedef enum {
-     ESP_BT_STATUS_SUCCESS                  =  0,          /* Successful operation. */
-     ESP_BT_STATUS_FAILURE                  =  1,          /* Generic failure. */
-     ESP_BT_STATUS_PENDING                  =  2,          /* API cannot be completed right now */
-     ESP_BT_STATUS_BUSY                     =  3,
-     ESP_BT_STATUS_NO_RESOURCES             =  4,
-     ESP_BT_STATUS_WRONG_MODE               =  5,
-     ESP_BT_STATUS_INVALID_STATIC_RAND_ADDR =  6,
 -    ESP_BT_STATUS_SUCCESS = 0,                  /* relate to BT_STATUS_SUCCESS in bt_def.h */
++    ESP_BT_STATUS_SUCCESS       = 0,            /* relate to BT_STATUS_SUCCESS in bt_def.h */
+     ESP_BT_STATUS_FAIL,                         /* relate to BT_STATUS_FAIL in bt_def.h */
+     ESP_BT_STATUS_NOT_READY,                    /* relate to BT_STATUS_NOT_READY in bt_def.h */
+     ESP_BT_STATUS_NOMEM,                        /* relate to BT_STATUS_NOMEM in bt_def.h */
+     ESP_BT_STATUS_BUSY,                         /* relate to BT_STATUS_BUSY in bt_def.h */
 -    ESP_BT_STATUS_DONE,                         /* relate to BT_STATUS_DONE in bt_def.h */
++    ESP_BT_STATUS_DONE          = 5,            /* relate to BT_STATUS_DONE in bt_def.h */
+     ESP_BT_STATUS_UNSUPPORTED,                  /* relate to BT_STATUS_UNSUPPORTED in bt_def.h */
+     ESP_BT_STATUS_PARM_INVALID,                 /* relate to BT_STATUS_PARM_INVALID in bt_def.h */
+     ESP_BT_STATUS_UNHANDLED,                    /* relate to BT_STATUS_UNHANDLED in bt_def.h */
+     ESP_BT_STATUS_AUTH_FAILURE,                 /* relate to BT_STATUS_AUTH_FAILURE in bt_def.h */
 -    ESP_BT_STATUS_RMT_DEV_DOWN,                 /* relate to BT_STATUS_RMT_DEV_DOWN in bt_def.h */
++    ESP_BT_STATUS_RMT_DEV_DOWN  = 10,           /* relate to BT_STATUS_RMT_DEV_DOWN in bt_def.h */
+     ESP_BT_STATUS_AUTH_REJECTED,                /* relate to BT_STATUS_AUTH_REJECTED in bt_def.h */
++    ESP_BT_STATUS_INVALID_STATIC_RAND_ADDR,
  } esp_bt_status_t;