Merge branch 'bugfix/restore_edr_en_and_protect_for_vhci_env' into 'master'

bugfix/restore edr_en and add protect for vhci_env

Closes IDFGH-6254, IDFGH-6766, IDFGH-7605, and AUD-3629

See merge request espressif/esp-idf!18388
This commit is contained in:
Wang Meng Yang
2022-07-01 19:31:01 +08:00