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

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

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