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

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

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

@ -1 +1 @@
Subproject commit b877f7e1fc98dccfcf4dbf31f215c5cb44ec3f0d Subproject commit ea4d1c936a0c9c05be7af3b5912fa49a7caad7ab