Merge branch 'bugfix/restore_edr_en_and_protect_for_vhci_env_v4.3' into 'release/v4.3'

bugfix/restore edr_en and add protect for vhci_env (v4.3)

See merge request espressif/esp-idf!18812
This commit is contained in:
Jiang Jiang Jian
2022-07-10 15:49:48 +08:00